From 980283dc6f31fe66c13de78aa67ec2141b540864 Mon Sep 17 00:00:00 2001
From: SlyVTT <pillot.sylvain@gmail.com>
Date: Thu, 13 Apr 2023 08:03:22 +0200
Subject: [PATCH] some cleaning + support 3.80

---
 CMakeLists.txt             |   2 +-
 CppOutRun.cbp              |  69 ---------------
 CppOutRun.cscope_file_list |  22 -----
 CppOutRun.layout           | 175 -------------------------------------
 src/main.cc                |   2 +-
 5 files changed, 2 insertions(+), 268 deletions(-)
 delete mode 100644 CppOutRun.cbp
 delete mode 100644 CppOutRun.cscope_file_list
 delete mode 100644 CppOutRun.layout

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5bfba2e..8f6e778 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -118,7 +118,7 @@ set(ASSETS_cg
 fxconv_declare_assets(${ASSETS_cg} WITH_METADATA)
 
 add_executable(myaddin ${SOURCES} ${ASSETS_${FXSDK_PLATFORM}})
-target_compile_options(myaddin PRIVATE -Wall -Wextra -Os -std=c++20 -fno-use-cxa-atexit -fpermissive)
+target_compile_options(myaddin PRIVATE -Wall -Wextra -Os -std=c++20 -fpermissive)
 target_link_options(myaddin PRIVATE -Wl,-Map=Build_Addin.map -Wl,--print-memory-usage)
 target_link_libraries(myaddin LibProf::LibProf Gint::Gint -lstdc++)
 
diff --git a/CppOutRun.cbp b/CppOutRun.cbp
deleted file mode 100644
index 2bf627d..0000000
--- a/CppOutRun.cbp
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="CppOutRun" />
-		<Option pch_mode="2" />
-		<Option compiler="null" />
-		<Build>
-			<Target title="Debug">
-				<Option output="bin/Debug/CppOutRun" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj/Debug/" />
-				<Option type="1" />
-				<Option compiler="null" />
-				<Compiler>
-					<Add directory="src/include" />
-				</Compiler>
-			</Target>
-			<Target title="Release">
-				<Option output="bin/Release/CppOutRun" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj/Release/" />
-				<Option type="1" />
-				<Option compiler="null" />
-				<Compiler>
-					<Add directory="src/include" />
-				</Compiler>
-			</Target>
-		</Build>
-		<Unit filename="CMakeLists.txt" />
-		<Unit filename="TODO.txt" />
-		<Unit filename="assets-cg/fxconv-metadata.txt" />
-		<Unit filename="assets-cg/traffic/fxconv-metadata.txt" />
-		<Unit filename="src/clock.cc" />
-		<Unit filename="src/clock.h" />
-		<Unit filename="src/colors.h" />
-		<Unit filename="src/fixed.h" />
-		<Unit filename="src/include/camera.h" />
-		<Unit filename="src/include/cars.h" />
-		<Unit filename="src/include/circuit.h" />
-		<Unit filename="src/include/clouds.h" />
-		<Unit filename="src/include/drawstuff.h" />
-		<Unit filename="src/include/menus.h" />
-		<Unit filename="src/include/saves.h" />
-		<Unit filename="src/include/segment.h" />
-		<Unit filename="src/include/utils.h" />
-		<Unit filename="src/main.cc" />
-		<Unit filename="src/parameters.h" />
-		<Unit filename="src/src/camera.cc" />
-		<Unit filename="src/src/cars.cc" />
-		<Unit filename="src/src/circuit.cc" />
-		<Unit filename="src/src/clouds.cc" />
-		<Unit filename="src/src/drawstuff.cc" />
-		<Unit filename="src/src/menus.cc" />
-		<Unit filename="src/src/saves.cc" />
-		<Unit filename="src/src/segment.cc" />
-		<Unit filename="src/src/utils.cc" />
-		<Extensions>
-			<DoxyBlocks>
-				<comment_style block="2" line="2" />
-				<doxyfile_project />
-				<doxyfile_build />
-				<doxyfile_warnings />
-				<doxyfile_output />
-				<doxyfile_dot />
-				<general />
-			</DoxyBlocks>
-			<lib_finder disable_auto="1" />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>
diff --git a/CppOutRun.cscope_file_list b/CppOutRun.cscope_file_list
deleted file mode 100644
index 58dca7f..0000000
--- a/CppOutRun.cscope_file_list
+++ /dev/null
@@ -1,22 +0,0 @@
-"/home/sylvain/Programmes/Casio/CppOutRun/assets-cg/fxconv-metadata.txt"
-"/home/sylvain/Programmes/Casio/CppOutRun/src/src/cars.cc"
-"/home/sylvain/Programmes/Casio/CppOutRun/src/colors.h"
-"/home/sylvain/Programmes/Casio/CppOutRun/src/include/drawstuff.h"
-"/home/sylvain/Programmes/Casio/CppOutRun/src/src/segment.cc"
-"/home/sylvain/Programmes/Casio/CppOutRun/src/parameters.h"
-"/home/sylvain/Programmes/Casio/CppOutRun/assets-cg/traffic/fxconv-metadata.txt"
-"/home/sylvain/Programmes/Casio/CppOutRun/src/src/circuit.cc"
-"/home/sylvain/Programmes/Casio/CppOutRun/TODO.txt"
-"/home/sylvain/Programmes/Casio/CppOutRun/src/src/drawstuff.cc"
-"/home/sylvain/Programmes/Casio/CppOutRun/src/src/camera.cc"
-"/home/sylvain/Programmes/Casio/CppOutRun/src/fixed.h"
-"/home/sylvain/Programmes/Casio/CppOutRun/src/include/camera.h"
-"/home/sylvain/Programmes/Casio/CppOutRun/src/main.cc"
-"/home/sylvain/Programmes/Casio/CppOutRun/CMakeLists.txt"
-"/home/sylvain/Programmes/Casio/CppOutRun/src/src/clouds.cc"
-"/home/sylvain/Programmes/Casio/CppOutRun/src/include/segment.h"
-"/home/sylvain/Programmes/Casio/CppOutRun/src/src/menus.cc"
-"/home/sylvain/Programmes/Casio/CppOutRun/src/include/cars.h"
-"/home/sylvain/Programmes/Casio/CppOutRun/src/include/clouds.h"
-"/home/sylvain/Programmes/Casio/CppOutRun/src/include/circuit.h"
-"/home/sylvain/Programmes/Casio/CppOutRun/src/include/menus.h"
diff --git a/CppOutRun.layout b/CppOutRun.layout
deleted file mode 100644
index 4114f50..0000000
--- a/CppOutRun.layout
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_layout_file>
-	<FileVersion major="1" minor="0" />
-	<ActiveTarget name="Release" />
-	<File name="src/include/camera.h" open="0" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="221" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="src/src/camera.cc" open="0" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="370" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="src/src/cars.cc" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="1019" topLine="8" />
-		</Cursor>
-	</File>
-	<File name="src/include/drawstuff.h" open="0" top="0" tabpos="11" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="655" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="src/clock.h" open="0" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="0" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="src/colors.h" open="0" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="35" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="src/src/circuit.cc" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="31927" topLine="269" />
-		</Cursor>
-		<Folding>
-			<Collapse line="68" />
-			<Collapse line="102" />
-			<Collapse line="154" />
-			<Collapse line="192" />
-			<Collapse line="229" />
-			<Collapse line="274" />
-			<Collapse line="292" />
-			<Collapse line="381" />
-			<Collapse line="554" />
-			<Collapse line="602" />
-			<Collapse line="612" />
-			<Collapse line="661" />
-			<Collapse line="711" />
-			<Collapse line="762" />
-			<Collapse line="835" />
-			<Collapse line="872" />
-			<Collapse line="1148" />
-			<Collapse line="1155" />
-			<Collapse line="1165" />
-			<Collapse line="1175" />
-		</Folding>
-	</File>
-	<File name="src/include/cars.h" open="0" top="0" tabpos="14" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="412" topLine="1" />
-		</Cursor>
-	</File>
-	<File name="src/include/saves.h" open="0" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="319" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="src/clock.cc" open="0" top="0" tabpos="11" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="975" topLine="73" />
-		</Cursor>
-	</File>
-	<File name="src/include/menus.h" open="0" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="505" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="src/src/clouds.cc" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="203" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="src/include/clouds.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="306" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="src/include/segment.h" open="0" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="783" topLine="3" />
-		</Cursor>
-	</File>
-	<File name="src/parameters.h" open="0" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="505" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="src/src/utils.cc" open="1" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="2658" topLine="70" />
-		</Cursor>
-	</File>
-	<File name="src/src/segment.cc" open="0" top="0" tabpos="15" split="0" active="1" splitpos="0" zoom_1="2" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="410" topLine="29" />
-		</Cursor>
-	</File>
-	<File name="src/src/drawstuff.cc" open="0" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="2807" topLine="14" />
-		</Cursor>
-		<Folding>
-			<Collapse line="9" />
-			<Collapse line="33" />
-			<Collapse line="40" />
-			<Collapse line="46" />
-			<Collapse line="76" />
-			<Collapse line="131" />
-		</Folding>
-	</File>
-	<File name="src/src/saves.cc" open="0" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="294" topLine="2" />
-		</Cursor>
-	</File>
-	<File name="src/main.cc" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="-2" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="43460" topLine="93" />
-		</Cursor>
-		<Folding>
-			<Collapse line="194" />
-		</Folding>
-	</File>
-	<File name="src/src/menus.cc" open="0" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="46095" topLine="898" />
-		</Cursor>
-		<Folding>
-			<Collapse line="116" />
-			<Collapse line="551" />
-			<Collapse line="666" />
-			<Collapse line="709" />
-			<Collapse line="872" />
-		</Folding>
-	</File>
-	<File name="CMakeLists.txt" open="0" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="302" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="src/include/circuit.h" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="1093" topLine="47" />
-		</Cursor>
-	</File>
-	<File name="src/fixed.h" open="0" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="5" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="TODO.txt" open="0" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="251" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="src/include/utils.h" open="0" top="0" tabpos="12" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="107" topLine="0" />
-		</Cursor>
-	</File>
-</CodeBlocks_layout_file>
diff --git a/src/main.cc b/src/main.cc
index 2444e37..54ddd80 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -474,7 +474,7 @@ int main(void)
         isOCPossible = false;
 #endif
 
-    if((!strncmp(osv, "03.", 3) && osv[3] <= '7') && gint[HWCALC] == HWCALC_FXCG50) // CG-50
+    if((!strncmp(osv, "03.", 3) && osv[3] <= '8') && gint[HWCALC] == HWCALC_FXCG50) // CG-50
     {
         extended_ram.name = "extram";
         extended_ram.is_default = true;