From 66a24edb4407a975c4499e740d01aa16d8efe9d1 Mon Sep 17 00:00:00 2001
From: Sylvain PILLOT <pillot.sylvain@gmail.com>
Date: Tue, 26 Mar 2024 21:19:52 +0100
Subject: [PATCH] added target to let build fx9860g_fxascg

---
 .gitignore     |  1 +
 CMakeLists.txt | 26 +++++++++++++++++++++++---
 clean          |  1 +
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 085829e..f834a6a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 /build-fx
 /build-cg
 /build-cg-push
+/build-fxg3a
 /*.g1a
 /*.g3a
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 65291bf..79f5ce9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,11 +8,11 @@ include(GenerateG1A)
 include(GenerateG3A)
 
 include(Fxconv)
-find_package(Gint 2.9 REQUIRED)
+find_package(Gint 2.10 REQUIRED)
 find_package(LibProf 2.4 REQUIRED)
 
 #set the color mode either to 1b or 2b
-set(COLORMODE_fx 2b)
+set(COLORMODE_fx 1b)
 #set the color mode either to 1b, 2b or EGA64
 set(COLORMODE_cg EGA64)
 
@@ -85,18 +85,21 @@ if("${FXSDK_PLATFORM_LONG}" STREQUAL fx9860G)
   add_executable(myaddin ${SOURCES} ${ASSETS} ${ASSETS_${FXSDK_PLATFORM}} ${ASSETS_${FXSDK_PLATFORM}_${COLORMODE_fx}} )
 elseif("${FXSDK_PLATFORM_LONG}" STREQUAL fxCG50)
   add_executable(myaddin ${SOURCES} ${ASSETS} ${ASSETS_${FXSDK_PLATFORM}} ${ASSETS_${FXSDK_PLATFORM}_${COLORMODE_cg}} )
+elseif("${FXSDK_PLATFORM_LONG}" STREQUAL fx9860G_G3A)
+  add_executable(myaddin ${SOURCES} ${ASSETS} ${ASSETS_${FXSDK_PLATFORM}} ${ASSETS_${FXSDK_PLATFORM}_${COLORMODE_fx}} )  
 endif()
 
+
 # fx colormode
 if("${COLORMODE_fx}" STREQUAL 1b)
   target_compile_options(myaddin PRIVATE -Wall -Wextra -Os -DCOLOR1BIT)
 endif()
 
-
 if("${COLORMODE_fx}" STREQUAL 2b)
   target_compile_options(myaddin PRIVATE -Wall -Wextra -Os -DCOLOR2BIT)
 endif()
 
+
 # cg colormode
 if("${COLORMODE_cg}" STREQUAL 1b)
   target_compile_options(myaddin PRIVATE -Wall -Wextra -Os -DCOLOR1BIT)
@@ -110,6 +113,7 @@ if("${COLORMODE_cg}" STREQUAL EGA64)
   target_compile_options(myaddin PRIVATE -Wall -Wextra -Os -DCOLOREGA)
 endif()
 
+
 target_link_options(myaddin PRIVATE -Wl,-Map=Build_Addin.map -Wl,--print-memory-usage)
 target_link_libraries(myaddin LibProf::LibProf Gint::Gint)
 
@@ -127,6 +131,7 @@ if("${FXSDK_PLATFORM_LONG}" STREQUAL fx9860G)
   endif()
 
 
+
 elseif("${FXSDK_PLATFORM_LONG}" STREQUAL fxCG50)
 
   if("${COLORMODE_cg}" STREQUAL 1b)
@@ -144,4 +149,19 @@ elseif("${FXSDK_PLATFORM_LONG}" STREQUAL fxCG50)
       NAME "RPG PC EGA" ICONS assets-cg/ega64/icon-uns-ega64.png assets-cg/ega64/icon-sel-ega64.png)
   endif()
 
+
+
+elseif("${FXSDK_PLATFORM_LONG}" STREQUAL fx9860G_G3A)
+
+  if("${COLORMODE_fx}" STREQUAL 1b)
+    generate_g3a(TARGET myaddin OUTPUT "RPG_1bfx.g3a"
+      NAME "RPG PC 1b fx" ICONS assets-cg/1b/icon-uns-1b.png assets-cg/1b/icon-sel-1b.png)
+  endif()
+
+  if("${COLORMODE_fx}" STREQUAL 2b)
+    generate_g3a(TARGET myaddin OUTPUT "RPG_2bfx.g3a"
+      NAME "RPG PC 2b fx" ICONS assets-cg/2b/icon-uns-2b.png assets-cg/2b/icon-sel-2b.png)
+  endif()
+
+
 endif()
diff --git a/clean b/clean
index 445982d..bcc4d2a 100755
--- a/clean
+++ b/clean
@@ -6,6 +6,7 @@ cd ..
 rm -r build-cg
 rm -r build-cg-push
 rm -r build-fx
+rm -r build-fxg3a
 rm *.g1a
 rm *.g3a