Skip to content

Commit

Permalink
Move osx specific data folder out of shared data folder
Browse files Browse the repository at this point in the history
  • Loading branch information
ZhilkinSerg authored and kevingranade committed Apr 29, 2020
1 parent bc87b3d commit 3c72197
Show file tree
Hide file tree
Showing 15 changed files with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -976,21 +976,21 @@ appclean:
rm -f data/auto_pickup.txt
rm -f data/fontlist.txt

data/osx/AppIcon.icns: data/osx/AppIcon.iconset
build-data/osx/AppIcon.icns: build-data/osx/AppIcon.iconset
iconutil -c icns $<

ifdef OSXCROSS
app: appclean version $(APPTARGET)
else
app: appclean version data/osx/AppIcon.icns $(APPTARGET)
app: appclean version build-data/osx/AppIcon.icns $(APPTARGET)
endif
mkdir -p $(APPTARGETDIR)/Contents
cp data/osx/Info.plist $(APPTARGETDIR)/Contents/
cp build-data/osx/Info.plist $(APPTARGETDIR)/Contents/
mkdir -p $(APPTARGETDIR)/Contents/MacOS
cp data/osx/Cataclysm.sh $(APPTARGETDIR)/Contents/MacOS/
cp build-data/osx/Cataclysm.sh $(APPTARGETDIR)/Contents/MacOS/
mkdir -p $(APPRESOURCESDIR)
cp $(APPTARGET) $(APPRESOURCESDIR)/
cp data/osx/AppIcon.icns $(APPRESOURCESDIR)/
cp build-data/osx/AppIcon.icns $(APPRESOURCESDIR)/
mkdir -p $(APPDATADIR)
cp data/fontdata.json $(APPDATADIR)
cp -R data/core $(APPDATADIR)
Expand Down Expand Up @@ -1047,14 +1047,14 @@ dmgdist: dmgdistclean $(L10N) app
ifdef OSXCROSS
mkdir Cataclysm
cp -a $(APPTARGETDIR) Cataclysm/$(APPTARGETDIR)
cp data/osx/DS_Store Cataclysm/.DS_Store
cp data/osx/dmgback.png Cataclysm/.background.png
cp build-data/osx/DS_Store Cataclysm/.DS_Store
cp build-data/osx/dmgback.png Cataclysm/.background.png
ln -s /Applications Cataclysm/Applications
genisoimage -quiet -D -V "Cataclysm DDA" -no-pad -r -apple -o Cataclysm-uncompressed.dmg Cataclysm/
dmg dmg Cataclysm-uncompressed.dmg Cataclysm.dmg
rm Cataclysm-uncompressed.dmg
else
dmgbuild -s data/osx/dmgsettings.py "Cataclysm DDA" Cataclysm.dmg
dmgbuild -s build-data/osx/dmgsettings.py "Cataclysm DDA" Cataclysm.dmg
endif

endif # ifeq ($(NATIVE), osx)
Expand Down
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.

0 comments on commit 3c72197

Please sign in to comment.