Started to eliminate WIN_DLLS directory

asalamon74 · May 10, 2020 · b27ca63 · b27ca63
1 parent f82e544
commit b27ca63
Show file tree

Hide file tree

Showing 13 changed files with 21 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -211,6 +211,7 @@ pktriggercord_commandline.html: pktriggercord-cli.1
 # Windows cross-compile
 windownload:
 	mkdir -p $(LOCALMINGW)/download
+	mkdir -p $(LOCALMINGW)/dll
 	wget -N http://ftp.gnome.org/pub/gnome/binaries/win32/gtk+/2.24/gtk+_2.24.10-1_win32.zip -P $(LOCALMINGW)/download
 	wget -N http://ftp.gnome.org/pub/gnome/binaries/win32/gtk+/2.24/gtk+-dev_2.24.10-1_win32.zip -P $(LOCALMINGW)/download
 	wget -N http://ftp.gnome.org/pub/gnome/binaries/win32/glib/2.28/glib-dev_2.28.8-1_win32.zip -P $(LOCALMINGW)/download
@@ -227,16 +228,34 @@ windownload:
 	unzip -o $(LOCALMINGW)/download/gdk-pixbuf-dev_2.24.0-1_win32.zip -d $(LOCALMINGW)
 	unzip -o $(LOCALMINGW)/download/gdk-pixbuf_2.24.0-1_win32.zip -d $(LOCALMINGW)
 	unzip -o $(LOCALMINGW)/download/cairo-dev_1.10.2-2_win32.zip -d $(LOCALMINGW)
+	wget -N http://ftp.gnome.org/pub/gnome/binaries/win32/glib/2.28/glib_2.28.8-1_win32.zip -P $(LOCALMINGW)/download
+	wget -N http://ftp.gnome.org/pub/gnome/binaries/win32/atk/1.32/atk_1.32.0-2_win32.zip -P $(LOCALMINGW)/download
+	wget -N http://ftp.gnome.org/pub/gnome/binaries/win32/pango/1.29/pango_1.29.4-1_win32.zip -P $(LOCALMINGW)/download
+	wget -N http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/cairo_1.10.2-2_win32.zip -P $(LOCALMINGW)/download
+	wget -N http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/libffi_3.0.6-1_win32.zip -P $(LOCALMINGW)/download
+	wget -N http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/libpng_1.4.12-1_win32.zip -P $(LOCALMINGW)/download
+	unzip -o $(LOCALMINGW)/download/glib_2.28.8-1_win32.zip -d $(LOCALMINGW)/dll -j bin/libgio-2.0-0.dll bin/libglib-2.0-0.dll bin/libgmodule-2.0-0.dll bin/libgobject-2.0-0.dll
+	unzip -o $(LOCALMINGW)/download/pango_1.29.4-1_win32.zip -d $(LOCALMINGW)/dll -j bin/libpango-1.0-0.dll bin/libpangowin32-1.0-0.dll bin/libpangocairo-1.0-0.dll
+	unzip -o $(LOCALMINGW)/download/cairo_1.10.2-2_win32.zip -d $(LOCALMINGW)/dll -j bin/libcairo-2.dll
+	unzip -o $(LOCALMINGW)/download/atk_1.32.0-2_win32.zip -d $(LOCALMINGW)/dll -j bin/libatk-1.0-0.dll
+	unzip -o $(LOCALMINGW)/download/libffi_3.0.6-1_win32.zip -d $(LOCALMINGW)/dll -j bin/libffi-5.dll
+	unzip -o $(LOCALMINGW)/download/libpng_1.4.12-1_win32.zip -d $(LOCALMINGW)/dll -j bin/libpng14-14.dll
+	cp $(LOCALMINGW)/bin/libgtk-win32-2.0-0.dll $(LOCALMINGW)/dll/
 
-windist: pktriggercord_commandline.html
+ifeq ($(ARCH),Win32)
+dist: pktriggercord_commandline.html cli gui lib
 	rm -rf $(WINDIR)
 	mkdir -p $(WINDIR)
-	cp $(TARGET_LIB) pktriggercord-cli.exe pktriggercord.exe $(WINDIR)
+	cp libpktriggercord-$(VERSION).dll pktriggercord-cli.exe pktriggercord.exe $(WINDIR)
 	cp Changelog COPYING pktriggercord_commandline.html pktriggercord.ui pentax_settings.json $(WINDIR)
+	cp $(LOCALMINGW)/dll/*.dll $(WINDIR)
 	cp $(WIN_DLLS_DIR)/*.dll $(WINDIR)
 	rm -f $(WINDIR).zip
 	zip -rj $(WINDIR).zip $(WINDIR)
 	rm -r $(WINDIR)
+else
+dist: rpm
+endif
 
 androidclean:
 	cd $(ANDROID_DIR) && ./gradlew clean

diff --git a/win_dlls/libatk-1.0-0.dll b/win_dlls/libatk-1.0-0.dll
diff --git a/win_dlls/libcairo-2.dll b/win_dlls/libcairo-2.dll
diff --git a/win_dlls/libffi-6.dll b/win_dlls/libffi-6.dll
diff --git a/win_dlls/libgio-2.0-0.dll b/win_dlls/libgio-2.0-0.dll
diff --git a/win_dlls/libglib-2.0-0.dll b/win_dlls/libglib-2.0-0.dll
diff --git a/win_dlls/libgmodule-2.0-0.dll b/win_dlls/libgmodule-2.0-0.dll
diff --git a/win_dlls/libgobject-2.0-0.dll b/win_dlls/libgobject-2.0-0.dll
diff --git a/win_dlls/libgtk-win32-2.0-0.dll b/win_dlls/libgtk-win32-2.0-0.dll
diff --git a/win_dlls/libpango-1.0-0.dll b/win_dlls/libpango-1.0-0.dll
diff --git a/win_dlls/libpangocairo-1.0-0.dll b/win_dlls/libpangocairo-1.0-0.dll
diff --git a/win_dlls/libpangowin32-1.0-0.dll b/win_dlls/libpangowin32-1.0-0.dll
diff --git a/win_dlls/libpng16-16.dll b/win_dlls/libpng16-16.dll