updates to make win32 building work again

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

View File

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