shithub: choc

Info  •  Files  •  Log  •  Branches

Fix GNUstep build.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1786

--- a/pkg/osx/GNUmakefile

+++ b/pkg/osx/GNUmakefile

@@ -4,6 +4,8 @@

 STAGING_DIR=staging

 DMG=$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).dmg

+ifndef GNUSTEP_MAKEFILES

+

 # DMG file containing package:

 $(DMG) : $(STAGING_DIR)

@@ -10,9 +12,7 @@

 	rm -f $@

 	hdiutil create -volname "$(PACKAGE_STRING)" -srcdir $(STAGING_DIR) $@

-clean : launcher_clean

-	rm -f $(DMG)

-	rm -rf $(STAGING_DIR)

+endif

 # Staging dir build for package:

@@ -26,12 +26,24 @@

 	cp launcher "$(APP_DIR)/Contents/MacOS/"

 	# TODO: copy Doom and setup binaries into app dir

 	# TODO: copy other documentation into staging dir

-	find $(STAGING_DIR) -name .svn -delete -exec rm -rf {} \;

+	find $(STAGING_DIR) -name .svn -delete -exec rm -rf {} \; || true

+clean : launcher_clean

+	rm -f $(DMG)

+	rm -rf $(STAGING_DIR)

+

 # Launcher build:

-CFLAGS=-Wall -I../..

-LDFLAGS=-framework Cocoa

+CFLAGS = -Wall -I../..

+

+# Are we building using gs_make?

+

+ifdef GNUSTEP_MAKEFILES

+CFLAGS += $(shell gnustep-config --objc-flags)

+LDFLAGS = $(shell gnustep-config --gui-libs)

+else

+LDFLAGS = -framework Cocoa

+endif

 LAUNCHER_OBJS= \

         AppController.o \