X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=blobdiff_plain;f=Makefile;h=282200fc98b59de8ef06666addc53d7e81327c0e;hp=7771ab2764beeb1d9135763a39aa78e10bb64145;hb=96769b52695c11ca7fe29b60933a4ef482062aa2;hpb=4705a111a1364fe5723d1358a16c9df38012f680

diff --git a/Makefile b/Makefile
index 7771ab27..282200fc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,58 +1,108 @@
-#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 = -lpthread
-
-EXE = x86
-A = a
-DLL = so
-NETAPI = berkley
-
-RADIANT_ABOUTMSG = Custom build
-
-LDD ?= ldd
-FIND ?= find
-RANLIB ?= ranlib
-AR ?= ar
-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"
-# from qe3.cpp: #elif defined(__APPLE__)
-# from qe3.cpp: "ppc"
-# from qe3.cpp: #elif defined(WIN32)
-# from qe3.cpp: "exe"
-# from qe3.cpp: #else
-# from qe3.cpp: #error "unknown platform"
-# from qe3.cpp: #endif
-# from qe3.cpp: ;
-
+-include Makefile.conf
+
+## CONFIGURATION SETTINGS
+# user customizable stuf
+# you may override this in Makefile.conf or the environment
+BUILD              ?= debug
+# or: release
+OS                 ?= $(shell uname)
+# or: Linux, Win32, Darwin
+CFLAGS             ?=
+CXXFLAGS           ?=
+CPPFLAGS           ?=
+LIBS               ?=
+RADIANT_ABOUTMSG   ?= Custom build
+CC                 ?= gcc
+CXX                ?= g++
+LDD                ?= ldd # nothing on Win32
+FIND               ?= find
+RANLIB             ?= ranlib
+AR                 ?= ar
+MKDIR              ?= mkdir -p
+CP                 ?= cp
+CAT                ?= cat
+SH                 ?= sh
+ECHO               ?= echo
+DIFF               ?= diff
+CP_R               ?= $(CP) -r
+RM_R               ?= $(RM) -r
+PKGCONFIG          ?= pkg-config
+TEE_STDERR         ?= | tee /dev/stderr
+CPPFLAGS_GLIB      ?= `$(PKGCONFIG) glib-2.0 --cflags`
+LIBS_GLIB          ?= `$(PKGCONFIG) glib-2.0 --libs-only-L` `pkg-config glib-2.0 --libs-only-l`
+CPPFLAGS_XML       ?= `$(PKGCONFIG) libxml-2.0 --cflags`
+LIBS_XML           ?= `$(PKGCONFIG) libxml-2.0 --libs-only-L` `pkg-config libxml-2.0 --libs-only-l`
+CPPFLAGS_PNG       ?= `$(PKGCONFIG) libpng --cflags`
+LIBS_PNG           ?= `$(PKGCONFIG) libpng --libs-only-L` `pkg-config libpng --libs-only-l`
+CPPFLAGS_GTK       ?= `$(PKGCONFIG) gtk+-2.0 --cflags`
+LIBS_GTK           ?= `$(PKGCONFIG) gtk+-2.0 --libs-only-L` `pkg-config gtk+-2.0 --libs-only-l`
+CPPFLAGS_GTKGLEXT  ?= `$(PKGCONFIG) gtkglext-1.0 --cflags`
+LIBS_GTKGLEXT      ?= `$(PKGCONFIG) gtkglext-1.0 --libs-only-L` `pkg-config gtkglext-1.0 --libs-only-l`
+CPPFLAGS_GL        ?=
+LIBS_GL            ?= -lGL # -lopengl32 on Win32
+CPPFLAGS_DL        ?=
+LIBS_DL            ?= -ldl # nothing on Win32
+CPPFLAGS_ZLIB      ?=
+LIBS_ZLIB          ?= -lz
+DEPEND_ON_MAKEFILE ?= yes
+
+# these are used on Win32 only
+GTKDIR             ?= `$(PKGCONFIG) gtk+-2.0 --variable=prefix`
+WHICHDLL           ?= which
+
+# alias mingw32 OSes
+ifeq ($(OS),MINGW32_NT-6.0)
+	OS = Win32
+endif
+
+CFLAGS_COMMON = -MMD -W -Wall -Wcast-align -Wcast-qual -Wno-unused-parameter
+CPPFLAGS_COMMON =
+LDFLAGS_COMMON =
+LIBS_COMMON =
+CXXFLAGS_COMMON = -Wno-non-virtual-dtor -Wreorder -fno-exceptions -fno-rtti
+
+ifeq ($(BUILD),debug)
+	CFLAGS_COMMON += -g3
+	CPPFLAGS_COMMON += -D_DEBUG
+	LDFLAGS_COMMON +=
+else ifeq ($(BUILD),release)
+	CFLAGS_COMMON += -O3
+	CPPFLAGS_COMMON +=
+	LDFLAGS_COMMON += -s
+else
+$(error Unsupported build type: $(BUILD))
+endif
+
+ifeq ($(OS),Linux)
+	CPPFLAGS_COMMON += -DPOSIX -DXWINDOWS -D_LINUX
+	CFLAGS_COMMON += -fPIC
+	LDFLAGS_DLL = -fPIC -ldl
+	LIBS_COMMON = -lpthread
+	EXE = x86
+	A = a
+	DLL = so
+	MWINDOWS =
+else ifeq ($(OS),Win32)
+	CPPFLAGS_COMMON += -DWIN32 -D_WIN32 -D_inline=inline
+	CFLAGS_COMMON += -mms-bitfields
+	LDFLAGS_DLL = --dll -Wl,--add-stdcall-alias
+	LIBS_COMMON = -lws2_32 -luser32 -lgdi32
+	EXE = exe
+	A = a
+	DLL = dll
+	MWINDOWS = -mwindows
+
+	# workaround: we have no "ldd" for Win32, so...
+	LDD =
+	# workaround: OpenGL library for Win32 is called opengl32.dll
+	LIBS_GL ?= -lopengl32
+	# workaround: no -ldl on Win32
+	LIBS_DL ?= 
+#else ifeq ($(OS),Darwin)
+#	EXE = ppc
+else
+$(error Unsupported build OS: $(OS))
+endif
 
 .PHONY: all
 all: \
@@ -84,15 +134,17 @@ all: \
 	install/qdata3.$(EXE) \
 	install/radiant.$(EXE) \
 	install-data \
+	install-dll \
 
 .PHONY: clean
 clean:
 	$(RM_R) install/
 	$(FIND) . \( -name \*.o -o -name \*.d -o -name \*.$(DLL) -o -name \*.$(A) -o -name \*.$(EXE) \) -exec $(RM) {} \;
+	$(RM) include/aboutmsg.h include/RADIANT_MAJOR include/version.h include/RADIANT_MINOR include/version
 
 %.$(EXE):
-	dir=$@; $(MKDIR) $${dir%/*}
-	$(CXX) -o $@ $^ $(LDFLAGS) $(LIBS) $(LIBS_EXTRA)
+	file=$@; $(MKDIR) $${file%/*}
+	$(CXX) $(LDFLAGS) $(LDFLAGS_COMMON) $(LDFLAGS_EXTRA) $(LIBS) $(LIBS_COMMON) $(LIBS_EXTRA) $^ -o $@
 	[ -z "$(LDD)" ] || [ -z "`$(LDD) -r $@ 2>&1 >/dev/null $(TEE_STDERR)`" ] || { $(RM) $@; exit 1; }
 
 %.$(A):
@@ -100,15 +152,15 @@ clean:
 	$(RANLIB) $@
 
 %.$(DLL):
-	dir=$@; $(MKDIR) $${dir%/*}
-	$(CXX) -shared -o $@ $^ $(LDFLAGS) $(LDFLAGS_DLL) $(LIBS) $(LIBS_EXTRA)
+	file=$@; $(MKDIR) $${file%/*}
+	$(CXX) $(LDFLAGS) $(LDFLAGS_COMMON) $(LDFLAGS_EXTRA) $(LDFLAGS_DLL) $(LIBS) $(LIBS_COMMON) $(LIBS_EXTRA) -shared $^ -o $@
 	[ -z "$(LDD)" ] || [ -z "`$(LDD) -r $@ 2>&1 >/dev/null $(TEE_STDERR)`" ] || { $(RM) $@; exit 1; }
 
-%.o: %.cpp
-	$(CXX) -c -o $@ $< $(CXXFLAGS) $(CPPFLAGS) $(CPPFLAGS_EXTRA)
+%.o: %.cpp $(if $(findstring $(DEPEND_ON_MAKEFILE),yes),$(wildcard Makefile*),)
+	$(CXX) $(CFLAGS) $(CXXFLAGS) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) $(CPPFLAGS) $(CPPFLAGS_COMMON) $(CPPFLAGS_EXTRA) $(TARGET_ARCH) -c $< -o $@
 
-%.o: %.c
-	$(CC) -c -o $@ $< $(CFLAGS) $(CPPFLAGS) $(CPPFLAGS_EXTRA)
+%.o: %.c $(if $(findstring $(DEPEND_ON_MAKEFILE),yes),$(wildcard Makefile*),)
+	$(CC) $(CFLAGS) $(CFLAGS_COMMON) $(CPPFLAGS) $(CPPFLAGS_COMMON) $(CPPFLAGS_EXTRA) $(TARGET_ARCH) -c $< -o $@
 
 install/q3map2.$(EXE): LIBS_EXTRA := $(LIBS_XML) $(LIBS_GLIB) $(LIBS_PNG)
 install/q3map2.$(EXE): CPPFLAGS_EXTRA := $(CPPFLAGS_XML) $(CPPFLAGS_GLIB) $(CPPFLAGS_PNG) -Itools/quake3/common -Ilibs -Iinclude
@@ -177,7 +229,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 +312,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 +355,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 +447,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 \
@@ -673,24 +727,41 @@ install/heretic2/h2data.$(EXE): \
 .PHONY: makeversion
 makeversion:
 	set -ex; \
-	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; \
+	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.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 +772,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:
+	WHICHDLL="$(WHICHDLL)" GTKDIR="$(GTKDIR)" CP="$(CP)" CAT="$(CAT)" MKDIR="$(MKDIR)" $(SH) install-dlls.sh
+else
+install-dll:
+	echo No DLL inclusion required for this target.
+endif
+
+-include $(shell find . -name \*.d)