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

Merge branch 'osxnetradiant'

Browse Source 
Conflicts:
	contrib/bobtoolz/DPatch.cpp
	contrib/bobtoolz/bobToolz-GTK.cpp
	contrib/bobtoolz/funchandlers-GTK.cpp
	install-dylibs.sh
	setup/data/osx/NetRadiant.app/Contents/MacOS/netradiant.sh
This commit is contained in:
Rudolf Polzer
2010-03-28 19:32:53 +02:00
parent d190c4f72c a3cfcb0acd
commit d40c79f30c
24 changed files with 569 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@@ -192,7 +192,8 @@ ifeq ($(OS),Darwin)
A = a
DLL = dylib
MWINDOWS =
MACVERSION ?= 16
CPPFLAGS_COMMON += -DMACVERSION="$(MACVERSION)"
# workaround for weird prints
ECHO_NOLF = /bin/echo -n
@@ -376,6 +377,7 @@ endif
%.o: %.c $(if $(findstring $(DEPEND_ON_MAKEFILE),yes),$(wildcard Makefile*),)
$(CC) $< $(CFLAGS) $(CFLAGS_COMMON) $(CPPFLAGS_EXTRA) $(CPPFLAGS_COMMON) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@
$(INSTALLDIR)/q3map2.$(EXE): LIBS_EXTRA := $(LIBS_XML) $(LIBS_GLIB) $(LIBS_PNG) $(LIBS_ZLIB)
$(INSTALLDIR)/q3map2.$(EXE): CPPFLAGS_EXTRA := $(CPPFLAGS_XML) $(CPPFLAGS_GLIB) $(CPPFLAGS_PNG) -Itools/quake3/common -Ilibs -Iinclude
$(INSTALLDIR)/q3map2.$(EXE): \
@@ -969,6 +971,8 @@ install-data: binaries
$(ECHO) $(RADIANT_MINOR_VERSION) > $(INSTALLDIR)/RADIANT_MINOR
$(ECHO) $(RADIANT_MAJOR_VERSION) > $(INSTALLDIR)/RADIANT_MAJOR
$(CP_R) setup/data/tools/* $(INSTALLDIR)/
$(MKDIR) $(INSTALLDIR)/docs
$(CP_R) docs/* $(INSTALLDIR)/docs/
$(FIND) $(INSTALLDIR_BASE)/ -name .svn -exec $(RM_R) {} \; -prune
.PHONY: install-dll