From 76b435c5353d4f43c1dfb2c8ad7c09b6b3193895 Mon Sep 17 00:00:00 2001
From: KikooDX <kikoodx@paranoici.org>
Date: Fri, 30 Apr 2021 02:04:52 +0200
Subject: [PATCH] Separate generated code from source files

---
 .gitignore              |  4 +---
 CMakeLists.txt          | 25 +++++++++++++------------
 compile_levels.py       |  2 +-
 editor/AST3generator.py |  2 +-
 time.py                 |  4 ++--
 update_levels.sh        |  2 +-
 6 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/.gitignore b/.gitignore
index b9adeb5..5e76ba3 100755
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,4 @@ build-cg/
 *.g3a
 
 # Generated sources
-src/setlevel.c
-src/times.c
-include/define.h
+generated/
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7ab1cda..14c5f0e 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,20 +9,21 @@ include(GenerateG3A)
 include(Fxconv)
 find_package(Gint 2.1 REQUIRED)
 
-include_directories(include)
+include_directories(include generated/include)
 
 add_custom_command(
-	OUTPUT "${CMAKE_CURRENT_LIST_DIR}/src/times.c"
-	COMMENT "Generate src/times.c"
-	COMMAND python3 time.py
+	OUTPUT "${CMAKE_CURRENT_LIST_DIR}/generated/times.c"
+	COMMENT "Generate generated/times.c"
+	COMMAND mkdir -p generated && python3 time.py
 	WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
-	DEPENDS time.py times.lvl include/define.h)
+	DEPENDS time.py times.lvl generated/include/define.h)
 
-add_custom_command(OUTPUT 
-		"${CMAKE_CURRENT_LIST_DIR}/src/setlevel.c"
-		"${CMAKE_CURRENT_LIST_DIR}/include/define.h"
-	COMMENT "Generate src/setlevel.c & include/define.h"
-	COMMAND sh update_levels.sh
+add_custom_command(
+	OUTPUT
+		"${CMAKE_CURRENT_LIST_DIR}/generated/setlevel.c"
+		"${CMAKE_CURRENT_LIST_DIR}/generated/include/define.h"
+	COMMENT "Generate generated/setlevel.c & generated/include/define.h"
+	COMMAND mkdir -p generated/include && sh update_levels.sh
 	WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
 	DEPENDS update_levels.sh compile_levels.py
 		editor/levels/0.lvl
@@ -50,8 +51,8 @@ set(SOURCES
 	src/main.c
 	src/menu.c
 	src/save.c
-	src/setlevel.c
-	src/times.c)
+	generated/setlevel.c
+	generated/times.c)
 
 set(ASSETS)
 set(ASSETS_fx)
diff --git a/compile_levels.py b/compile_levels.py
index 4edf88c..74bbb85 100755
--- a/compile_levels.py
+++ b/compile_levels.py
@@ -1,6 +1,6 @@
 ids = 0
 
-save = open("src/setlevel.c","w+")
+save = open("generated/setlevel.c","w+")
 save.write("#include \"setlevel.h\"\n#include <gint/std/string.h>\nvoid set_level(int id_level, char level[], int *startx, \
 int *starty, char *gravity, int *appear, int *disappear, int *nbswitch){\nswitch(id_level){")
 while 1:
diff --git a/editor/AST3generator.py b/editor/AST3generator.py
index 09ee11e..9d0959b 100755
--- a/editor/AST3generator.py
+++ b/editor/AST3generator.py
@@ -125,7 +125,7 @@ font = pygame.font.SysFont('arial',25,True)
 #Defini la suite des blocs pendant les changements (cliquer sur un 1 va donner un 2...)
 suite=["0","1","d","s","e","k","3","K","a","c","m","t","l","b","B","i","S","h","z"]
 
-lvm = open(f"include/define.h","r")
+lvm = open(f"generated/include/define.h","r")
 id_level = 0
 gravityid = 6
 disa = 10
diff --git a/time.py b/time.py
index a345d08..8b4674c 100755
--- a/time.py
+++ b/time.py
@@ -3,8 +3,8 @@ argent = 1.5
 bronze = 2
 
 timeslevel = open("times.lvl","r+")
-dest = open("src/times.c","w")
-lvm = open("include/define.h","r")
+dest = open("generated/times.c","w")
+lvm = open("generated/include/define.h","r")
 ids=timeslevel.readlines()
 times=[]
 
diff --git a/update_levels.sh b/update_levels.sh
index a4f6fa0..6688bb4 100755
--- a/update_levels.sh
+++ b/update_levels.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 echo "#define LEVEL_MAX $(ls editor/levels/[^0]*.lvl | wc -l)
 #define PLAYER_HEIGHT 11
-#define FPS 70" > include/define.h
+#define FPS 70" > generated/include/define.h
 python3 compile_levels.py