From 84b4f7610283c5302ba1fbdcbef66ffb5aef5a02 Mon Sep 17 00:00:00 2001
From: Thomas Bernard <miniupnp@free.fr>
Date: Wed, 20 Feb 2019 15:29:08 +0100
Subject: [PATCH] GP2X: scripts, fonts, etc. are in data/

---
 src/Makefile | 15 +++++++++++++++
 src/setup.c  |  3 ++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/Makefile b/src/Makefile
index bcb7a3af..6e18538d 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -964,6 +964,20 @@ ifdef ATARICROSS
 	  $(ZIP) $(ZIPOPT) -k --to-crlf -r "$(CURDIR)/../grafx2-$(API)-$(VERSIONTAG)$(TTFLABEL)-$(PLATFORM).$(ZIP)" \
 	    GRAFX2/gfx2def.ini GRAFX2/DOC/ GRAFX2/SCRIPTS/
 	$(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
 	cd .. && $(ZIP) $(ZIPOPT) "grafx2-$(API)-$(VERSIONTAG)$(TTFLABEL)-$(PLATFORM).$(ZIP)" \
 	  $(BIN:../%=%) $(SCRIPT_FILES:../%=%) $(SKIN_FILES:../%=%) \
@@ -981,6 +995,7 @@ ifeq ($(PLATFORM),Darwin)
 	cd .. && $(ZIP) $(ZIPOPT) $(APPZIPNAME) \
 	  $(DOC_FILES:../%=%) $(DOC_FILESRTF:../%=%) $(SRCARCH:../%=%)
 endif
+endif
 endif
 	$(AT)$(TAR) czf "../grafx2-$(VERSIONTAG)-src.tgz" $(TARTRANSFORM) \
 	  ../src/*.c ../src/*.cpp ../src/*.h ../src/Makefile \
diff --git a/src/setup.c b/src/setup.c
index 394de020..5a430e8e 100644
--- a/src/setup.c
+++ b/src/setup.c
@@ -135,7 +135,8 @@ void Set_data_directory(const char * program_dir, char * data_dir)
     strcat(data_dir,"Contents/Resources/");
   // 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__)
-    strcat(data_dir,"share/grafx2/");
+    //strcat(data_dir,"share/grafx2/");
+    strcat(data_dir, "data/");
   //on tos, the same directory is used for everything
   #elif defined (__MINT__)
     strcpy(data_dir, program_dir);