]> de.git.xonotic.org Git - xonotic/netradiant.git/blobdiff - Makefile
new DLL setup; now working with Gtk+ 2.2
[xonotic/netradiant.git] / Makefile
index e10eaf1d3baed1f1109edb865c1274edb24ba25f..a65c1d9b522e107d42317c0c64cfa7e7c9692b9c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,97 @@
-#CFLAGS = -MMD -W -Wall -Wcast-align -Wcast-qual -Wno-unused-parameter -g3 -fPIC
-CFLAGS = -MMD -W -Wall -Wcast-align -Wcast-qual -Wno-unused-parameter -fPIC -O3
-LDFLAGS = -s
-CXXFLAGS = $(CFLAGS) -Wno-non-virtual-dtor -Wreorder -fno-exceptions -fno-rtti
-#CPPFLAGS = -DPOSIX -DXWINDOWS -D_DEBUG -D_LINUX
-CPPFLAGS = -DPOSIX -DXWINDOWS -D_LINUX
-#LDFLAGS_DLL = -fPIC -Wl,-fini,fini_stub -static-libgcc -ldl
-LDFLAGS_DLL = -fPIC -ldl
-LIBS_COMMON = -lpthread
-
-EXE = x86
-A = a
-DLL = so
-NETAPI = berkley
+include Makefile.conf
+
+ifeq ($(OS),MINGW32_NT-6.0)
+       OS = Win32
+endif
+
+CFLAGS     = -MMD -W -Wall -Wcast-align -Wcast-qual -Wno-unused-parameter
+CPPFLAGS   = 
+LDFLAGS    =
+LIBS       =
+CXXFLAGS   = $(CFLAGS) -Wno-non-virtual-dtor -Wreorder -fno-exceptions -fno-rtti
+CFLAGS_OPT = -O3
+
+ifneq ($(MINGW),)
+       MINGWPREFIX ?= i586-mingw32msvc-
+       CC = $(MINGWPREFIX)gcc
+       CXX = $(MINGWPREFIX)g++
+       RANLIB = $(MINGWPREFIX)ranlib
+       AR = $(MINGWPREFIX)ar
+       OS := Win32
+       CPPFLAGS += -I$(MINGW)/include -D_inline=inline
+       CFLAGS   += 
+       LDFLAGS  += -L$(MINGW)/lib
+
+       CPPFLAGS_GLIB = -I$(MINGW)/include/glib-2.0 -I$(MINGW)/lib/glib-2.0/include
+       LIBS_GLIB = -lglib-2.0
+       CPPFLAGS_XML = -I$(MINGW)/include/libxml2
+       LIBS_XML = -lxml2
+       CPPFLAGS_PNG = -I$(MINGW)/include/libpng12 -DPNG_NO_MMX_CODE
+       LIBS_PNG = -lpng12
+       CPPFLAGS_GTK = -I$(MINGW)/include/gtk-2.0 -I$(MINGW)/lib/gtk-2.0/include -I$(MINGW)/include/atk-1.0 -I$(MINGW)/include/cairo -I$(MINGW)/include/pango-1.0 -I$(MINGW)/include/glib-2.0 -I$(MINGW)/lib/glib-2.0/include -I$(MINGW)/include/libpng12 -DPNG_NO_MMX_CODE
+       LIBS_GTK = -lgtk-win32-2.0 -lgdk-win32-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 -lpangowin32-1.0
+       CPPFLAGS_GTKGLEXT = -I$(MINGW)/include/gtkglext-1.0 -I$(MINGW)/lib/gtkglext-1.0/include 
+       LIBS_GTKGLEXT = -lgtkglext-win32-1.0 -lgdkglext-win32-1.0 -lgtk-win32-2.0 -lgdk-win32-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 -lpangowin32-1.0
+       CPPFLAGS_GL =
+       LIBS_GL = -lopengl32
+       CPPFLAGS_DL =
+       LIBS_DL =
+       CPPFLAGS_ZLIB =
+       LIBS_ZLIB = -lz
+endif
+
+ifeq ($(BUILD),debug)
+       CFLAGS += -g3
+       CPPFLAGS += -D_DEBUG
+else ifeq ($(BUILD),release)
+       CFLAGS += $(CFLAGS_OPT)
+       LDFLAGS += -s
+else
+$(error Unsupported build type)
+endif
+
+ifeq ($(OS),Linux)
+       CPPFLAGS += -DPOSIX -DXWINDOWS -D_LINUX
+       CFLAGS += -fPIC
+       LDFLAGS_DLL = -fPIC -ldl
+       LIBS = -lpthread
+       EXE = x86
+       A = a
+       DLL = so
+       MWINDOWS =
+else ifeq ($(OS),Win32)
+       CPPFLAGS += -DWIN32 -D_WIN32 -D_inline=inline
+       CFLAGS += -mms-bitfields
+       LDFLAGS_DLL = --dll -Wl,--add-stdcall-alias
+       LIBS = -lws2_32 -luser32 -lgdi32
+       EXE = exe
+       A = a
+       DLL = dll
+       MWINDOWS = -mwindows
+       LDD =
+       LIBS_GL ?= -lopengl32
+       LIBS_DL ?= 
+#else ifeq ($(OS),Darwin)
+else
+$(error Unsupported build OS: $(OS))
+endif
+
+CPPFLAGS_GLIB ?= `pkg-config glib-2.0 --cflags`
+LIBS_GLIB ?= `pkg-config glib-2.0 --libs-only-L` `pkg-config glib-2.0 --libs-only-l`
+CPPFLAGS_XML ?= `pkg-config libxml-2.0 --cflags`
+LIBS_XML ?= `pkg-config libxml-2.0 --libs-only-L` `pkg-config libxml-2.0 --libs-only-l`
+CPPFLAGS_PNG ?= `pkg-config libpng --cflags`
+LIBS_PNG ?= `pkg-config libpng --libs-only-L` `pkg-config libpng --libs-only-l`
+CPPFLAGS_GTK ?= `pkg-config gtk+-2.0 --cflags`
+LIBS_GTK ?= `pkg-config gtk+-2.0 --libs-only-L` `pkg-config gtk+-2.0 --libs-only-l`
+CPPFLAGS_GTKGLEXT ?= `pkg-config gtkglext-1.0 --cflags`
+LIBS_GTKGLEXT ?= `pkg-config gtkglext-1.0 --libs-only-L` `pkg-config gtkglext-1.0 --libs-only-l`
+CPPFLAGS_GL ?=
+LIBS_GL ?= -lGL
+CPPFLAGS_DL ?=
+LIBS_DL ?= -ldl
+CPPFLAGS_ZLIB =
+LIBS_ZLIB = -lz
 
 RADIANT_ABOUTMSG = Custom build
 
@@ -19,28 +99,13 @@ LDD ?= ldd
 FIND ?= find
 RANLIB ?= ranlib
 AR ?= ar
+OBJDUMP ?= objdump
 MKDIR ?= mkdir -p
 CP ?= cp
 CP_R ?= $(CP) -r
 RM_R ?= $(RM) -r
-
 TEE_STDERR ?= | tee /dev/stderr
 
-CPPFLAGS_GLIB = `pkg-config glib-2.0 --cflags`
-LIBS_GLIB = `pkg-config glib-2.0 --libs-only-l --libs-only-L`
-
-CPPFLAGS_XML = `xml2-config --cflags`
-LIBS_XML = `xml2-config --libs`
-
-CPPFLAGS_PNG = `libpng-config --cflags`
-LIBS_PNG = `libpng-config --libs`
-
-CPPFLAGS_GTK = `pkg-config gtk+-2.0 --cflags`
-LIBS_GTK = `pkg-config gtk+-2.0 --libs-only-l --libs-only-L`
-
-CPPFLAGS_GTKGLEXT = `pkg-config gtkglext-1.0 --cflags`
-LIBS_GTKGLEXT = `pkg-config gtkglext-1.0 --libs-only-l --libs-only-L`
-
 # from qe3.cpp: const char* const EXECUTABLE_TYPE = 
 # from qe3.cpp: #if defined(__linux__) || defined (__FreeBSD__)
 # from qe3.cpp: "x86"
@@ -53,7 +118,6 @@ LIBS_GTKGLEXT = `pkg-config gtkglext-1.0 --libs-only-l --libs-only-L`
 # from qe3.cpp: #endif
 # from qe3.cpp: ;
 
-
 .PHONY: all
 all: \
        makeversion \
@@ -84,6 +148,7 @@ all: \
        install/qdata3.$(EXE) \
        install/radiant.$(EXE) \
        install-data \
+       install-dll \
 
 .PHONY: clean
 clean:
@@ -92,7 +157,7 @@ clean:
 
 %.$(EXE):
        dir=$@; $(MKDIR) $${dir%/*}
-       $(CXX) -o $@ $^ $(LDFLAGS) $(LIBS) $(LIBS_EXTRA)
+       $(CXX) -o $@ $^ $(LDFLAGS) $(LDFLAGS_EXTRA) $(LIBS_EXTRA) $(LIBS)
        [ -z "$(LDD)" ] || [ -z "`$(LDD) -r $@ 2>&1 >/dev/null $(TEE_STDERR)`" ] || { $(RM) $@; exit 1; }
 
 %.$(A):
@@ -101,7 +166,7 @@ clean:
 
 %.$(DLL):
        dir=$@; $(MKDIR) $${dir%/*}
-       $(CXX) -shared -o $@ $^ $(LDFLAGS) $(LDFLAGS_DLL) $(LIBS) $(LIBS_EXTRA)
+       $(CXX) -shared -o $@ $^ $(LDFLAGS) $(LDFLAGS_DLL) $(LDFLAGS_EXTRA) $(LIBS_EXTRA) $(LIBS)
        [ -z "$(LDD)" ] || [ -z "`$(LDD) -r $@ 2>&1 >/dev/null $(TEE_STDERR)`" ] || { $(RM) $@; exit 1; }
 
 %.o: %.cpp
@@ -177,7 +242,7 @@ libmathlib.$(A): \
 libl_net.$(A): CPPFLAGS_EXTRA := -Ilibs
 libl_net.$(A): \
        libs/l_net/l_net.o \
-       libs/l_net/l_net_$(NETAPI).o \
+       $(if $(findstring $(OS),Win32),libs/l_net/l_net_wins.o,libs/l_net/l_net_berkley.o) \
 
 libjpeg6.$(A): CPPFLAGS_EXTRA := -Ilibs/jpeg6 -Ilibs
 libjpeg6.$(A): \
@@ -260,8 +325,9 @@ install/q3data.$(EXE): \
        libl_net.$(A) \
        libmathlib.$(A) \
 
-install/radiant.$(EXE): LIBS_EXTRA := -ldl -lGL -static-libgcc $(LIBS_XML) $(LIBS_GLIB) $(LIBS_GTK) $(LIBS_GTKGLEXT)
-install/radiant.$(EXE): CPPFLAGS_EXTRA := $(CPPFLAGS_XML) $(CPPFLAGS_GLIB) $(CPPFLAGS_GTK) $(CPPFLAGS_GTKGLEXT) -Ilibs -Iinclude
+install/radiant.$(EXE): LDFLAGS_EXTRA := $(MWINDOWS)
+install/radiant.$(EXE): LIBS_EXTRA := $(LIBS_GL) $(LIBS_DL) $(LIBS_XML) $(LIBS_GLIB) $(LIBS_GTK) $(LIBS_GTKGLEXT)
+install/radiant.$(EXE): CPPFLAGS_EXTRA := $(CPPFLAGS_GL) $(CPPFLAGS_DL) $(CPPFLAGS_XML) $(CPPFLAGS_GLIB) $(CPPFLAGS_GTK) $(CPPFLAGS_GTKGLEXT) -Ilibs -Iinclude
 install/radiant.$(EXE): \
        radiant/autosave.o \
        radiant/brushmanip.o \
@@ -302,6 +368,7 @@ install/radiant.$(EXE): \
        radiant/mainframe.o \
        radiant/main.o \
        radiant/map.o \
+       $(if $(findstring $(OS),Win32),radiant/multimon.o,) \
        radiant/mru.o \
        radiant/nullmodel.o \
        radiant/parse.o \
@@ -393,8 +460,8 @@ libxmllib.$(A): \
        libs/xml/xmltextags.o \
        libs/xml/xmlwriter.o \
 
-install/modules/archivezip.$(DLL): LIBS_EXTRA := -lz
-install/modules/archivezip.$(DLL): CPPFLAGS_EXTRA := -Ilibs -Iinclude
+install/modules/archivezip.$(DLL): LIBS_EXTRA := $(LIBS_ZLIB)
+install/modules/archivezip.$(DLL): CPPFLAGS_EXTRA := $(CPPFLAGS_ZLIB) -Ilibs -Iinclude
 install/modules/archivezip.$(DLL): \
        plugins/archivezip/archive.o \
        plugins/archivezip/pkzip.o \
@@ -676,21 +743,38 @@ makeversion:
        ver=`cat include/version.default`; \
        major=`echo $$ver | cut -d . -f 2`; \
        minor=`echo $$ver | cut -d . -f 3 | cut -d - -f 1`; \
-       echo "// generated header, see Makefile" > include/version.h; \
-       echo "#define RADIANT_VERSION \"$$ver\"" >> include/version.h; \
-       echo "#define RADIANT_MAJOR_VERSION \"$$major\"" >> include/version.h; \
-       echo "#define RADIANT_MINOR_VERSION \"$$minor\"" >> include/version.h; \
-       echo "$$major" > include/RADIANT_MAJOR; \
-       echo "$$minor" > include/RADIANT_MINOR; \
-       echo "$$ver" > include/version; \
-       echo "// generated header, see Makefile" > include/aboutmsg.h; \
-       echo "#define RADIANT_ABOUTMSG \"$(RADIANT_ABOUTMSG)\"" >> include/aboutmsg.h; \
+       echo "// generated header, see Makefile" > include/version.h.new; \
+       echo "#define RADIANT_VERSION \"$$ver\"" >> include/version.h.new; \
+       echo "#define RADIANT_MAJOR_VERSION \"$$major\"" >> include/version.h.new; \
+       echo "#define RADIANT_MINOR_VERSION \"$$minor\"" >> include/version.h.new; \
+       echo "$$major" > include/RADIANT_MAJOR.new; \
+       echo "$$minor" > include/RADIANT_MINOR.new; \
+       echo "$$ver" > include/version.new; \
+       echo "// generated header, see Makefile" > include/aboutmsg.h.new; \
+       echo "#define RADIANT_ABOUTMSG \"$(RADIANT_ABOUTMSG)\"" >> include/aboutmsg.h.new; \
+       mv_if_diff() \
+       { \
+               if diff $$1 $$2 >/dev/null 2>&1; then \
+                       rm -f $$1; \
+               else \
+                       mv $$1 $$2; \
+               fi; \
+       }; \
+       mv_if_diff include/version.h.new include/version.h; \
+       mv_if_diff include/RADIANT_MAJOR.new include/RADIANT_MAJOR; \
+       mv_if_diff include/RADIANT_MINOR.new include/RADIANT_MINOR; \
+       mv_if_diff include/version.new include/version; \
+       mv_if_diff include/aboutmsg.h.new include/aboutmsg.h
 
 .PHONY: install-data
-install-data:
+install-data: makeversion
        $(MKDIR) install/games
+       $(FIND) install/ -name .svn -exec $(RM_R) {} \; -prune
        set -ex; \
        for GAME in games/*; do \
+               if [ -d "$$GAME/tools" ]; then \
+                       GAME=$$GAME/tools; \
+               fi; \
                for GAMEFILE in $$GAME/games/*.game; do \
                        $(CP) "$$GAMEFILE" install/games/; \
                done; \
@@ -701,6 +785,15 @@ install-data:
        $(CP) include/RADIANT_MAJOR install/
        $(CP) include/RADIANT_MINOR install/
        $(CP_R) setup/data/tools/* install/
-       $(FIND) install/ -name .svn -exec $(RM_R) {} \; -prune; \
-
--include $(shell `find . -name \*.d`)
+       $(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)