diff --git a/windows-installer/Makefile b/windows-installer/Makefile index 4c83c342f76fe4bb53fc184bba0be3a69215fba1..5d9d36e8471fe842450e20fa31b287cd7c7b9740 100644 --- a/windows-installer/Makefile +++ b/windows-installer/Makefile @@ -37,7 +37,11 @@ collect: installer: #@cd $(SRCDIR) - @$(MAKENSIS) $(INSTALLERSRC) + @cp ~/.wine/drive_c/windows/system32/python27.dll $(COLLECTDIR)/src/dist/ + @cp ~/.wine/drive_c/windows/system32/api-ms-win-core-localregistry-l1-1-0.dll $(COLLECTDIR)/src/dist/ + @cp ~/.wine/drive_c/windows/system32/api-ms-win-core-processthreads-l1-1-0.dll $(COLLECTDIR)/src/dist/ + @cp ~/.wine/drive_c/windows/system32/api-ms-win-security-base-l1-1-0.dll $(COLLECTDIR)/src/dist/ + @$(MAKENSIS) $(INSTALLERSRC) @mkdir -p "windows-agent" @cp build/DataSID.exe "windows-agent" @cp 7zS.sfx "windows-agent" diff --git a/windows-installer/install-essencials.sh b/windows-installer/install-essencials.sh index 6f979680d4b576e8dc2e3b5e75a439e525fb56c4..493c37d011842a1c8df93d1a61d2627b1db1866d 100755 --- a/windows-installer/install-essencials.sh +++ b/windows-installer/install-essencials.sh @@ -1,6 +1,6 @@ #!/bin/bash -REQUIRED_PKGS="wine gcc-mingw-w64 p7zip-full" +REQUIRED_PKGS="wine gcc-mingw-w64 p7zip-full autoconf" pkgs_to_install="" for pkg in $REQUIRED_PKGS; do if ! dpkg --get-selections $pkg | grep -q -w install$; then @@ -8,7 +8,7 @@ for pkg in $REQUIRED_PKGS; do fi done -test -z $pkgs_to_install || sudo apt-get install $pkgs_to_install -y +test -z $pkgs_to_install || sudo add-apt-repository ppa:ubuntu-wine/ppa || sudo update apt-get installsudo apt-get install $pkgs_to_install -y required_wine_pkgs="/tmp/nsis-2.45.exe /tmp/python-2.7.5.msi /tmp/py2exe.exe /tmp/pywin32.exe /tmp/wmi.exe"