teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-15 08:52:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix osxbuild.sh on my setup.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@2388 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2012-02-26 17:32:53 +00:00
parent 925b27e3cd
commit 75ea167ce2
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
polymer/eduke32/Makefile
View file

@ -287,8 +287,9 @@ ifeq (1,$(RELEASE))
endif endif
endif endif
ifeq ($(PLATFORM),DARWIN) ifeq ($(PLATFORM),DARWIN)
cp -f "Apple/bundles/EDuke32.app" "./" cp -rf "Apple/bundles/EDuke32.app" "./"
mv -f "eduke32$(EXESUFFIX)" "EDuke32.app/Contents/MacOS/" mkdir -p "EDuke32.app/Contents/MacOS"
cp -f "eduke32$(EXESUFFIX)" "EDuke32.app/Contents/MacOS/"
endif endif
mapster32$(EXESUFFIX): $(EDITOROBJS) $(EOBJ)/$(EDITORLIB) $(EOBJ)/$(ENGINELIB) $(JAUDIOLIBDIR)/$(JAUDIOLIB) mapster32$(EXESUFFIX): $(EDITOROBJS) $(EOBJ)/$(EDITORLIB) $(EOBJ)/$(ENGINELIB) $(JAUDIOLIBDIR)/$(JAUDIOLIB)
@ -300,8 +301,9 @@ ifeq (1,$(RELEASE))
endif endif
endif endif
ifeq ($(PLATFORM),DARWIN) ifeq ($(PLATFORM),DARWIN)
cp -f "Apple/bundles/Mapster32.app" "./" cp -rf "Apple/bundles/Mapster32.app" "./"
mv -f "mapster32$(EXESUFFIX)" "Mapster32.app/Contents/MacOS/" mkdir -p "Mapster32.app/Contents/MacOS"
cp -f "mapster32$(EXESUFFIX)" "Mapster32.app/Contents/MacOS/"
endif endif
include Makefile.deps include Makefile.deps
@ -410,7 +412,10 @@ $(RSRC)/editor_banner.c: $(RSRC)/build.bmp
# PHONIES # PHONIES
clean: clean:
-rm -f $(OBJ)/* eduke32$(EXESUFFIX) eduke32$(EXESUFFIX).memmap EDuke32.app mapster32$(EXESUFFIX) mapster32$(EXESUFFIX).memmap Mapster32.app core* duke3d_w32$(EXESUFFIX) && $(MAKE) -C $(JAUDIOLIBDIR) clean && $(MAKE) -C $(ENETDIR) clean -rm -f $(OBJ)/* eduke32$(EXESUFFIX) eduke32$(EXESUFFIX).memmap mapster32$(EXESUFFIX) mapster32$(EXESUFFIX).memmap core* duke3d_w32$(EXESUFFIX) && $(MAKE) -C $(JAUDIOLIBDIR) clean && $(MAKE) -C $(ENETDIR) clean
ifeq ($(PLATFORM),DARWIN)
-rm -rf EDuke32.app Mapster32.app
endif
echo -n "" > $(OBJ)/keep.me echo -n "" > $(OBJ)/keep.me
veryclean: clean veryclean: clean

2
polymer/eduke32/osxbuild.sh
View file

@ -91,7 +91,7 @@ fi
# fi # fi
# Almost done... # Almost done...
if [ -f mapster32.x64 ] && [ -f eduke32.x86 ] && [ -f eduke32.ppc ]; then if [ -f mapster32.x64 ] && [ -f eduke32.x86 ]; then # && [ -f eduke32.ppc ]; then
echo Creating fat binaries. echo Creating fat binaries.
lipo -create mapster32.x64 mapster32.x86 -output mapster32 lipo -create mapster32.x64 mapster32.x86 -output mapster32