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

even more makefile fixes

Browse Source 
git-svn-id: svn://svn.icculus.org/netradiant/trunk@64 61c419a2-8eb2-4b30-bcec-8cead039b335
This commit is contained in:
rpolzer 2008-09-16 16:17:01 +00:00
parent 96769b5269
commit 16164a2ee9
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Makefile
View File

@ -12,12 +12,16 @@ CXXFLAGS ?=
CPPFLAGS ?= CPPFLAGS ?=
LIBS ?= LIBS ?=
RADIANT_ABOUTMSG ?= Custom build RADIANT_ABOUTMSG ?= Custom build
CC ?= gcc CC ?= gcc
CXX ?= g++ CXX ?= g++
LDD ?= ldd # nothing on Win32 LDD ?= ldd # nothing on Win32
FIND ?= find
RANLIB ?= ranlib RANLIB ?= ranlib
AR ?= ar AR ?= ar
PKGCONFIG ?= pkg-config
PKG_CONFIG_PATH ?=
FIND ?= find
MKDIR ?= mkdir -p MKDIR ?= mkdir -p
CP ?= cp CP ?= cp
CAT ?= cat CAT ?= cat
@ -26,7 +30,7 @@ ECHO ?= echo
DIFF ?= diff DIFF ?= diff
CP_R ?= $(CP) -r CP_R ?= $(CP) -r
RM_R ?= $(RM) -r RM_R ?= $(RM) -r
PKGCONFIG ?= pkg-config
TEE_STDERR ?= | tee /dev/stderr TEE_STDERR ?= | tee /dev/stderr
CPPFLAGS_GLIB ?= `$(PKGCONFIG) glib-2.0 --cflags` CPPFLAGS_GLIB ?= `$(PKGCONFIG) glib-2.0 --cflags`
LIBS_GLIB ?= `$(PKGCONFIG) glib-2.0 --libs-only-L` `pkg-config glib-2.0 --libs-only-l` LIBS_GLIB ?= `$(PKGCONFIG) glib-2.0 --libs-only-L` `pkg-config glib-2.0 --libs-only-l`
@ -50,6 +54,13 @@ DEPEND_ON_MAKEFILE ?= yes
GTKDIR ?= `$(PKGCONFIG) gtk+-2.0 --variable=prefix` GTKDIR ?= `$(PKGCONFIG) gtk+-2.0 --variable=prefix`
WHICHDLL ?= which WHICHDLL ?= which
export WHICHDLL
export GTKDIR
export CP
export CAT
export MKDIR
export PKG_CONFIG_PATH
# alias mingw32 OSes # alias mingw32 OSes
ifeq ($(OS),MINGW32_NT-6.0) ifeq ($(OS),MINGW32_NT-6.0)
OS = Win32 OS = Win32
@ -144,7 +155,7 @@ clean:
%.$(EXE): %.$(EXE):
file=$@; $(MKDIR) $${file%/*} file=$@; $(MKDIR) $${file%/*}
$(CXX) $(LDFLAGS) $(LDFLAGS_COMMON) $(LDFLAGS_EXTRA) $(LIBS) $(LIBS_COMMON) $(LIBS_EXTRA) $^ -o $@ $(CXX) $^ $(LDFLAGS) $(LDFLAGS_COMMON) $(LDFLAGS_EXTRA) $(LIBS_EXTRA) $(LIBS_COMMON) $(LIBS) -o $@
[ -z "$(LDD)" ] || [ -z "`$(LDD) -r $@ 2>&1 >/dev/null $(TEE_STDERR)`" ] || { $(RM) $@; exit 1; } [ -z "$(LDD)" ] || [ -z "`$(LDD) -r $@ 2>&1 >/dev/null $(TEE_STDERR)`" ] || { $(RM) $@; exit 1; }
%.$(A): %.$(A):
@ -153,14 +164,14 @@ clean:
%.$(DLL): %.$(DLL):
file=$@; $(MKDIR) $${file%/*} file=$@; $(MKDIR) $${file%/*}
$(CXX) $(LDFLAGS) $(LDFLAGS_COMMON) $(LDFLAGS_EXTRA) $(LDFLAGS_DLL) $(LIBS) $(LIBS_COMMON) $(LIBS_EXTRA) -shared $^ -o $@ $(CXX) $^ $(LDFLAGS) $(LDFLAGS_COMMON) $(LDFLAGS_EXTRA) $(LDFLAGS_DLL) $(LIBS_EXTRA) $(LIBS_COMMON) $(LIBS) -shared -o $@
[ -z "$(LDD)" ] || [ -z "`$(LDD) -r $@ 2>&1 >/dev/null $(TEE_STDERR)`" ] || { $(RM) $@; exit 1; } [ -z "$(LDD)" ] || [ -z "`$(LDD) -r $@ 2>&1 >/dev/null $(TEE_STDERR)`" ] || { $(RM) $@; exit 1; }
%.o: %.cpp $(if $(findstring $(DEPEND_ON_MAKEFILE),yes),$(wildcard Makefile*),) %.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 $@ $(CXX) $< $(CFLAGS) $(CXXFLAGS) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) $(CPPFLAGS) $(CPPFLAGS_COMMON) $(CPPFLAGS_EXTRA) $(TARGET_ARCH) -c -o $@
%.o: %.c $(if $(findstring $(DEPEND_ON_MAKEFILE),yes),$(wildcard Makefile*),) %.o: %.c $(if $(findstring $(DEPEND_ON_MAKEFILE),yes),$(wildcard Makefile*),)
$(CC) $(CFLAGS) $(CFLAGS_COMMON) $(CPPFLAGS) $(CPPFLAGS_COMMON) $(CPPFLAGS_EXTRA) $(TARGET_ARCH) -c $< -o $@ $(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): LIBS_EXTRA := $(LIBS_XML) $(LIBS_GLIB) $(LIBS_PNG)
install/q3map2.$(EXE): CPPFLAGS_EXTRA := $(CPPFLAGS_XML) $(CPPFLAGS_GLIB) $(CPPFLAGS_PNG) -Itools/quake3/common -Ilibs -Iinclude install/q3map2.$(EXE): CPPFLAGS_EXTRA := $(CPPFLAGS_XML) $(CPPFLAGS_GLIB) $(CPPFLAGS_PNG) -Itools/quake3/common -Ilibs -Iinclude
@ -777,7 +788,7 @@ install-data: makeversion
.PHONY: install-dll .PHONY: install-dll
ifeq ($(OS),Win32) ifeq ($(OS),Win32)
install-dll: install-dll:
WHICHDLL="$(WHICHDLL)" GTKDIR="$(GTKDIR)" CP="$(CP)" CAT="$(CAT)" MKDIR="$(MKDIR)" $(SH) install-dlls.sh $(SH) install-dlls.sh
else else
install-dll: install-dll:
echo No DLL inclusion required for this target. echo No DLL inclusion required for this target.