new DLL setup; now working with Gtk+ 2.2

[xonotic/netradiant.git] / Makefile

diff --git a/Makefile b/Makefile
index c1f2c16847b9a776bf62e577e07b1101ad3b1abb..a65c1d9b522e107d42317c0c64cfa7e7c9692b9c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -62,7 +62,7 @@ ifeq ($(OS),Linux)
 else ifeq ($(OS),Win32)
        CPPFLAGS += -DWIN32 -D_WIN32 -D_inline=inline
        CFLAGS += -mms-bitfields
-       LDFLAGS_DLL = --dll
+       LDFLAGS_DLL = --dll -Wl,--add-stdcall-alias
        LIBS = -lws2_32 -luser32 -lgdi32
        EXE = exe
        A = a
@@ -99,6 +99,7 @@ LDD ?= ldd
 FIND ?= find
 RANLIB ?= ranlib
 AR ?= ar
+OBJDUMP ?= objdump
 MKDIR ?= mkdir -p
 CP ?= cp
 CP_R ?= $(CP) -r
@@ -147,6 +148,7 @@ all: \
        install/qdata3.$(EXE) \
        install/radiant.$(EXE) \
        install-data \
+       install-dll \
 
 .PHONY: clean
 clean:
@@ -767,7 +769,7 @@ makeversion:
 .PHONY: install-data
 install-data: makeversion
        $(MKDIR) install/games
-       $(FIND) install/ -name .svn -exec $(RM_R) {} \; -prune; \
+       $(FIND) install/ -name .svn -exec $(RM_R) {} \; -prune
        set -ex; \
        for GAME in games/*; do \
                if [ -d "$$GAME/tools" ]; then \
@@ -783,6 +785,15 @@ install-data: makeversion
        $(CP) include/RADIANT_MAJOR install/
        $(CP) include/RADIANT_MINOR install/
        $(CP_R) setup/data/tools/* install/
-       $(FIND) install/ -name .svn -exec $(RM_R) {} \; -prune; \
+       $(FIND) install/ -name .svn -exec $(RM_R) {} \; -prune
+
+.PHONY: install-dll
+ifeq ($(OS),Win32)
+install-dll:
+       sh install-dlls.sh
+else
+install-dll:
+       echo No DLL inclusion required for this target.
+endif
 
 -include $(shell find . -name \*.d)