quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updates to make win32 building work again

Browse Source
This commit is contained in:
Rudolf Polzer 2010-12-08 13:30:58 +01:00
parent 85fdf3de30
commit e92d32fdb9
4 changed files with 55 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
cross-Makefile.conf
View File

@ -5,24 +5,5 @@
# how to call the mingw tools # how to call the mingw tools
MINGW_EXEC_PREFIX = i586-mingw32msvc- MINGW_EXEC_PREFIX = i586-mingw32msvc-
# where the dependencies package is extracted # use mingw32
RADIANT_DEPENDENCIES_PREFIX = $(HOME)/radiant-deps-mingw32/ include mingw-Makefile.inc
# 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

33
install-dlls.sh
View File

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

28
mingw-Makefile.conf
View File

@ -2,28 +2,8 @@
# copy this file to Makefile.conf # copy this file to Makefile.conf
# edit the paths in here # edit the paths in here
# how to call the mingw tools # how to get pkg-config
MINGW_EXEC_PREFIX = PKGCONFIG = $(RADIANT_DEPENDENCIES_PREFIX)/gtk/bin/pkg-config.exe
# where the dependencies package is extracted # use mingw32
RADIANT_DEPENDENCIES_PREFIX = /c/mingw/radiant-deps-mingw32/ include mingw-Makefile.inc
# 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

29
mingw-Makefile.inc Normal file
View File

@ -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