From af443b859dba7f59f4cb442c45e274dabb4ff831 Mon Sep 17 00:00:00 2001 From: Jay Dolan Date: Sat, 14 Feb 2015 10:25:03 -0500 Subject: [PATCH] Update Makefile to remove OSX build diretives. We build for OSX just like its Linux now. Those wishing to build the app bundle should use setup/apple/Makefile. --- Makefile | 8 -------- 1 file changed, 8 deletions(-) diff --git a/Makefile b/Makefile index 9eee1212..1fe334df 100644 --- a/Makefile +++ b/Makefile @@ -233,8 +233,6 @@ ifeq ($(OS),Darwin) # workaround: we have no "ldd" for OS X, so... LDD = OTOOL = otool - - INSTALLDIR := $(INSTALLDIR_BASE)/NetRadiant.app/Contents/MacOS/install else $(error Unsupported build OS: $(OS)) @@ -1045,7 +1043,6 @@ $(INSTALLDIR)/heretic2/h2data.$(EXE): \ install-data: binaries $(MKDIR) $(INSTALLDIR)/games $(FIND) $(INSTALLDIR_BASE)/ -name .svn -exec $(RM_R) {} \; -prune - [ "$(OS)" != "Darwin" ] || $(CP_R) setup/data/osx/NetRadiant.app/* $(INSTALLDIR_BASE)/NetRadiant.app/ DOWNLOAD_GAMEPACKS="$(DOWNLOAD_GAMEPACKS)" GIT="$(GIT)" SVN="$(SVN)" WGET="$(WGET)" RM_R="$(RM_R)" MV="$(MV)" UNZIPPER="$(UNZIPPER)" ECHO="$(ECHO)" SH="$(SH)" CP="$(CP)" CP_R="$(CP_R)" $(SH) install-gamepacks.sh "$(INSTALLDIR)" $(ECHO) $(RADIANT_MINOR_VERSION) > $(INSTALLDIR)/RADIANT_MINOR $(ECHO) $(RADIANT_MAJOR_VERSION) > $(INSTALLDIR)/RADIANT_MAJOR @@ -1059,14 +1056,9 @@ ifeq ($(OS),Win32) install-dll: binaries MKDIR="$(MKDIR)" CP="$(CP)" CAT="$(CAT)" GTKDIR="$(GTKDIR)" WHICHDLL="$(WHICHDLL)" INSTALLDIR="$(INSTALLDIR)" $(SH) $(DLLINSTALL) else -ifeq ($(OS),Darwin) -install-dll: binaries - EXE="$(EXE)" MACLIBDIR="$(MACLIBDIR)" CP="$(CP)" OTOOL="$(OTOOL)" INSTALLDIR="$(INSTALLDIR)" $(SH) install-dylibs.sh -else install-dll: binaries @$(ECHO) No DLL inclusion implemented for this target. endif -endif # release building... NOT for general users # these may use tools not in the list that is checked by the build system -- 2.39.2