updates to make win32 building work again

diff --git a/cross-Makefile.conf b/cross-Makefile.conf
index f503195dce537fde7ef90f55a8f728557e94a44a..2b44320d998e6a08251fdb76bbf3e68375f3dcbc 100644 (file)
--- a/cross-Makefile.conf
+++ b/cross-Makefile.conf
@@ -5,24 +5,5 @@
 # how to call the mingw tools
 MINGW_EXEC_PREFIX = i586-mingw32msvc-
 
-# where the dependencies package is extracted
-RADIANT_DEPENDENCIES_PREFIX = $(HOME)/radiant-deps-mingw32/
-
-# run the prefix fixing tool
-IGNORETHIS := $(shell cd $(RADIANT_DEPENDENCIES_PREFIX) && ./fixprefix.sh)
-
-# set the environment for make
-OS = Win32
-CFLAGS +=
-CXXFLAGS +=
-CPPFLAGS += -I$(RADIANT_DEPENDENCIES_PREFIX)/radiantdeps/include
-LDFLAGS += -L$(RADIANT_DEPENDENCIES_PREFIX)/radiantdeps/lib
-PKG_CONFIG_PATH := $(RADIANT_DEPENDENCIES_PREFIX)/gtk/lib/pkgconfig:$(RADIANT_DEPENDENCIES_PREFIX)/radiantdeps/lib/pkgconfig:$(PKG_CONFIG_PATH)
-WHICHDLL = $(RADIANT_DEPENDENCIES_PREFIX)/whichdll.sh
-
-CC = $(MINGW_EXEC_PREFIX)gcc
-CXX = $(MINGW_EXEC_PREFIX)g++
-LDD =
-RANLIB = $(MINGW_EXEC_PREFIX)ranlib
-AR = $(MINGW_EXEC_PREFIX)ar
-WINDRES = $(MINGW_EXEC_PREFIX)windres
+# use mingw32
+include mingw-Makefile.inc

diff --git a/install-dlls.sh b/install-dlls.sh
index d6fb970e54f3fd75798fed22630e7479fc2f7920..69da64158be952a1cf4a6c40869fa041e95cae8f 100755 (executable)
--- a/install-dlls.sh
+++ b/install-dlls.sh
@@ -13,35 +13,42 @@ for DLL in \
        intl.dll \
        libatk-1.0-0.dll \
        libcairo-2.dll \
+       libfontconfig-1.dll \
+       libfreetype6.dll \
        libgdk-win32-2.0-0.dll \
        libgdk_pixbuf-2.0-0.dll \
        libgdkglext-win32-1.0-0.dll \
+       libgio-2.0-0.dll \
        libglib-2.0-0.dll \
        libgmodule-2.0-0.dll \
        libgobject-2.0-0.dll \
+       libgthread-2.0-0.dll \
        libgtk-win32-2.0-0.dll \
        libgtkglext-win32-1.0-0.dll \
        libpango-1.0-0.dll \
        libpangocairo-1.0-0.dll \
+       libpangoft2-1.0-0.dll \
        libpangowin32-1.0-0.dll \
-       libpng12-0.dll \
+       libpng14-14.dll \
        libxml2-2.dll \
        zlib1.dll \
 ; do
        $CP "`$WHICHDLL $DLL`" $INSTALLDIR/
 done
 
-$CP "$GTKDIR/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.dll" $INSTALLDIR/libgdk-win32-2.0-0-pixbufloader-bmp.dll
-$MKDIR $INSTALLDIR/etc/gtk-2.0
-$CAT > $INSTALLDIR/etc/gtk-2.0/gdk-pixbuf.loaders <<'EOF'
-# GdkPixbuf Image Loader Modules file
+# apparently we no longer need this workaround:
 #
+# $CP "$GTKDIR/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.dll" $INSTALLDIR/libgdk-win32-2.0-0-pixbufloader-bmp.dll
+# $MKDIR $INSTALLDIR/etc/gtk-2.0
+# $CAT > $INSTALLDIR/etc/gtk-2.0/gdk-pixbuf.loaders <<'EOF'
+# # GdkPixbuf Image Loader Modules file
+# #
+# #
 #
-
-"libgdk-win32-2.0-0-pixbufloader-bmp.dll"
-"bmp" 5 "gtk20" "The BMP image format"
-"image/bmp" "image/x-bmp" "image/x-MS-bmp" ""
-"bmp" ""
-"BM" "" 100
-
-EOF
+# "libgdk-win32-2.0-0-pixbufloader-bmp.dll"
+# "bmp" 5 "gtk20" "The BMP image format"
+# "image/bmp" "image/x-bmp" "image/x-MS-bmp" ""
+# "bmp" ""
+# "BM" "" 100
+#
+# EOF

diff --git a/mingw-Makefile.conf b/mingw-Makefile.conf
index 652421aca0f0f2f82b0ab326e1738434b097d049..e6c08904a1bc50377ee0993b8498366d5c08ca4d 100644 (file)
--- a/mingw-Makefile.conf
+++ b/mingw-Makefile.conf
@@ -2,28 +2,8 @@
 # copy this file to Makefile.conf
 # edit the paths in here
 
-# how to call the mingw tools
-MINGW_EXEC_PREFIX = 
+# how to get pkg-config
+PKGCONFIG = $(RADIANT_DEPENDENCIES_PREFIX)/gtk/bin/pkg-config.exe
 
-# where the dependencies package is extracted
-RADIANT_DEPENDENCIES_PREFIX = /c/mingw/radiant-deps-mingw32/
-
-# run the prefix fixing tool
-IGNORETHIS := $(shell cd $(RADIANT_DEPENDENCIES_PREFIX) && ./fixprefix.sh)
-
-# set the environment for make
-OS = Win32
-CFLAGS +=
-CXXFLAGS +=
-CPPFLAGS += -I$(RADIANT_DEPENDENCIES_PREFIX)/radiantdeps/include
-LDFLAGS += -L$(RADIANT_DEPENDENCIES_PREFIX)/radiantdeps/lib
-PKG_CONFIG_PATH := $(RADIANT_DEPENDENCIES_PREFIX)/gtk/lib/pkgconfig:$(RADIANT_DEPENDENCIES_PREFIX)/radiantdeps/lib/pkgconfig:$(PKG_CONFIG_PATH)
-WHICHDLL = $(RADIANT_DEPENDENCIES_PREFIX)/whichdll.sh
-
-CC = $(MINGW_EXEC_PREFIX)gcc
-CXX = $(MINGW_EXEC_PREFIX)g++
-LDD =
-RANLIB = $(MINGW_EXEC_PREFIX)ranlib
-AR = $(MINGW_EXEC_PREFIX)ar
-WINDRES = $(MINGW_EXEC_PREFIX)windres
-PKGCONFIG = $(RADIANT_DEPENDENCIES_PREFIX)/gtk/bin/pkg-config
+# use mingw32
+include mingw-Makefile.inc

diff --git a/mingw-Makefile.inc b/mingw-Makefile.inc
new file mode 100644 (file)
index 0000000..0710fe1
--- /dev/null
+++ b/mingw-Makefile.inc
@@ -0,0 +1,29 @@
+# how to call the mingw tools
+MINGW_EXEC_PREFIX ?=
+
+# where the dependencies package is extracted
+RADIANT_DEPENDENCIES_PREFIX = $(HOME)/radiant-deps-mingw32/
+
+# run the prefix fixing tool
+IGNORETHIS := $(shell cd $(RADIANT_DEPENDENCIES_PREFIX) && ./fixprefix.sh)
+
+# set the environment for make
+OS = Win32
+CFLAGS +=
+CXXFLAGS +=
+CPPFLAGS += -I$(RADIANT_DEPENDENCIES_PREFIX)/radiantdeps/include
+LDFLAGS += -L$(RADIANT_DEPENDENCIES_PREFIX)/radiantdeps/lib
+CPPFLAGS += -I$(RADIANT_DEPENDENCIES_PREFIX)/gtk/include
+LDFLAGS += -L$(RADIANT_DEPENDENCIES_PREFIX)/gtk/lib
+PKG_CONFIG_PATH := $(RADIANT_DEPENDENCIES_PREFIX)/gtk/lib/pkgconfig:$(RADIANT_DEPENDENCIES_PREFIX)/radiantdeps/lib/pkgconfig:$(PKG_CONFIG_PATH)
+WHICHDLL = $(RADIANT_DEPENDENCIES_PREFIX)/whichdll.sh
+
+#CPPFLAGS_XML =
+#LIBS_XML = -lxml2
+
+CC = $(MINGW_EXEC_PREFIX)gcc
+CXX = $(MINGW_EXEC_PREFIX)g++
+LDD =
+RANLIB = $(MINGW_EXEC_PREFIX)ranlib
+AR = $(MINGW_EXEC_PREFIX)ar
+WINDRES = $(MINGW_EXEC_PREFIX)windres