m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GP2X: scripts, fonts, etc. are in data/

Browse Source
This commit is contained in:
Thomas Bernard 2019-02-20 15:29:08 +01:00
parent 4a0b47dd32
commit 84b4f76102
No known key found for this signature in database
GPG Key ID: 0FF11B67A5C0863C
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Makefile
View File

@ -964,6 +964,20 @@ ifdef ATARICROSS
$(ZIP) $(ZIPOPT) -k --to-crlf -r "$(CURDIR)/../grafx2-$(API)-$(VERSIONTAG)$(TTFLABEL)-$(PLATFORM).$(ZIP)" \ $(ZIP) $(ZIPOPT) -k --to-crlf -r "$(CURDIR)/../grafx2-$(API)-$(VERSIONTAG)$(TTFLABEL)-$(PLATFORM).$(ZIP)" \
GRAFX2/gfx2def.ini GRAFX2/DOC/ GRAFX2/SCRIPTS/ GRAFX2/gfx2def.ini GRAFX2/DOC/ GRAFX2/SCRIPTS/
$(AT)$(RM) -r $(TMP) $(AT)$(RM) -r $(TMP)
else
ifdef GP2XCROSS
$(eval TMP := $(shell mktemp -d))
$(AT)$(MKDIR) $(TMP)/data
$(AT)$(CP) $(BIN) $(TMP)
$(AT)$(CP) -R ../share/grafx2/* $(TMP)/data
cd .. && $(ZIP) $(ZIPOPT) "grafx2-$(API)-$(VERSIONTAG)$(TTFLABEL)-$(PLATFORM).$(ZIP)" \
$(DOC_FILES:../%=%) $(DOC_FILESRTF:../%=%) $(SRCARCH:../%=%)
cd $(TMP) && \
$(ZIP) $(ZIPOPT) "$(CURDIR)/../grafx2-$(API)-$(VERSIONTAG)$(TTFLABEL)-$(PLATFORM).$(ZIP)" \
$(BIN:../bin/%=%) $(SCRIPT_FILES:../share/grafx2/%=data/%) \
$(SKIN_FILES:../share/grafx2/%=data/%) $(FONT_FILES:../share/grafx2/%=data/%) \
data/gfx2def.ini
$(AT)$(RM) -r $(TMP)
else else
cd .. && $(ZIP) $(ZIPOPT) "grafx2-$(API)-$(VERSIONTAG)$(TTFLABEL)-$(PLATFORM).$(ZIP)" \ cd .. && $(ZIP) $(ZIPOPT) "grafx2-$(API)-$(VERSIONTAG)$(TTFLABEL)-$(PLATFORM).$(ZIP)" \
$(BIN:../%=%) $(SCRIPT_FILES:../%=%) $(SKIN_FILES:../%=%) \ $(BIN:../%=%) $(SCRIPT_FILES:../%=%) $(SKIN_FILES:../%=%) \
@ -981,6 +995,7 @@ ifeq ($(PLATFORM),Darwin)
cd .. && $(ZIP) $(ZIPOPT) $(APPZIPNAME) \ cd .. && $(ZIP) $(ZIPOPT) $(APPZIPNAME) \
$(DOC_FILES:../%=%) $(DOC_FILESRTF:../%=%) $(SRCARCH:../%=%) $(DOC_FILES:../%=%) $(DOC_FILESRTF:../%=%) $(SRCARCH:../%=%)
endif endif
endif
endif endif
$(AT)$(TAR) czf "../grafx2-$(VERSIONTAG)-src.tgz" $(TARTRANSFORM) \ $(AT)$(TAR) czf "../grafx2-$(VERSIONTAG)-src.tgz" $(TARTRANSFORM) \
../src/*.c ../src/*.cpp ../src/*.h ../src/Makefile \ ../src/*.c ../src/*.cpp ../src/*.h ../src/Makefile \

3
src/setup.c
View File

@ -135,7 +135,8 @@ void Set_data_directory(const char * program_dir, char * data_dir)
strcat(data_dir,"Contents/Resources/"); strcat(data_dir,"Contents/Resources/");
// On GP2X, AROS and Android, executable is not in bin/ // On GP2X, AROS and Android, executable is not in bin/
#elif defined (__GP2X__) || defined (__gp2x__) || defined (__WIZ__) || defined (__CAANOO__) || defined(GCWZERO) || defined(__AROS__) || defined(__ANDROID__) #elif defined (__GP2X__) || defined (__gp2x__) || defined (__WIZ__) || defined (__CAANOO__) || defined(GCWZERO) || defined(__AROS__) || defined(__ANDROID__)
strcat(data_dir,"share/grafx2/"); //strcat(data_dir,"share/grafx2/");
strcat(data_dir, "data/");
//on tos, the same directory is used for everything //on tos, the same directory is used for everything
#elif defined (__MINT__) #elif defined (__MINT__)
strcpy(data_dir, program_dir); strcpy(data_dir, program_dir);