diff options
| author | Simon Howard | 2010-01-04 22:19:53 +0000 |
|---|---|---|
| committer | Simon Howard | 2010-01-04 22:19:53 +0000 |
| commit | c94870783a025514286df1d8bb43cf616b865547 (patch) | |
| tree | 8295f8b68625f1aa4741aed184a286eabce91aad /pkg | |
| parent | afb95216afb043a56122a3f57292bf0ded5d7775 (diff) | |
| download | chocolate-doom-c94870783a025514286df1d8bb43cf616b865547.tar.gz chocolate-doom-c94870783a025514286df1d8bb43cf616b865547.tar.bz2 chocolate-doom-c94870783a025514286df1d8bb43cf616b865547.zip | |
Fix GNUstep build.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1786
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/osx/GNUmakefile | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/pkg/osx/GNUmakefile b/pkg/osx/GNUmakefile index cf9d1ffb..67f0fed8 100644 --- a/pkg/osx/GNUmakefile +++ b/pkg/osx/GNUmakefile @@ -4,15 +4,15 @@ include config.make STAGING_DIR=staging DMG=$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).dmg +ifndef GNUSTEP_MAKEFILES + # DMG file containing package: $(DMG) : $(STAGING_DIR) 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 @@ $(STAGING_DIR): launcher 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 \ |