Few tweaks for proper compilation, config.h changes and removed tccdefs.h usage. Gunner's TCC fork is further functionally freestanding now.

6 files changed, 17 insertions, 18 deletions

diff --git a/build.sh b/build.sh
index 5188d84..4c444f1 100644
--- a/build.sh
+++ b/build.sh
@@ -76,15 +76,15 @@ RAYLIB_SRC="$ROOT_DIR/$RAYLIB_SRC"
 TINYCC_SRC="$ROOT_DIR/tinycc"
 
 # Flags
-COMPILATION_FLAGS="-std=c99 -Os -flto -s -D__USE_MINGW_ANSI_STDIO=0 -mno-stack-arg-probe -Xlinker --stack=0x200000,0x200000 
+COMPILATION_FLAGS="-std=gnu99 -Os -flto -s -D__USE_MINGW_ANSI_STDIO=0 -mno-stack-arg-probe -Xlinker --stack=0x200000,0x200000 
  -fno-asynchronous-unwind-tables -fwhole-program -Wl,--gc-sections -mavx"
 FINAL_FLAGS=$COMPILATION_FLAGS
 WARNING_FLAGS="-Wall -Wextra"
 LINK_FLAGS="-lopengl32 -lgdi32 -lwinmm"
 # Debug changes to flags
 if [ -n "$BUILD_DEBUG" ]; then
-    COMPILATION_FLAGS="-std=c99 -O0 -g3"
-	FINAL_FLAGS="-std=c99 -Og -g3 -fsanitize-trap=undefined"
+    COMPILATION_FLAGS="-std=gnu99 -O0 -g3"
+	FINAL_FLAGS="-std=gnu99 -Og -g3 -fsanitize-trap=undefined"
 fi
 
 # Display what we're doing
diff --git a/raylib/config.h b/raylib/config.h
index c59e57d..2593b58 100644
--- a/raylib/config.h
+++ b/raylib/config.h
@@ -35,7 +35,7 @@
 #define SUPPORT_MODULE_RSHAPES          1
 #define SUPPORT_MODULE_RTEXTURES        1
 #define SUPPORT_MODULE_RTEXT            1       // WARNING: It requires SUPPORT_MODULE_RTEXTURES to load sprite font textures
-#define SUPPORT_MODULE_RMODELS          1
+//#define SUPPORT_MODULE_RMODELS          1
 #define SUPPORT_MODULE_RAUDIO           1
 
 //------------------------------------------------------------------------------------
@@ -221,7 +221,7 @@
 //#define SUPPORT_FILEFORMAT_MP3          1
 #define SUPPORT_FILEFORMAT_QOA          1
 //#define SUPPORT_FILEFORMAT_FLAC         1
-#define SUPPORT_FILEFORMAT_XM           1
+//#define SUPPORT_FILEFORMAT_XM           1
 //#define SUPPORT_FILEFORMAT_MOD          1
 
 // raudio: Configuration values
diff --git a/raylib/rcore.c b/raylib/rcore.c
index d6e8128..d263869 100644
--- a/raylib/rcore.c
+++ b/raylib/rcore.c
@@ -1780,8 +1780,6 @@ void SetWindowMonitor(int monitor)
             if ((screenWidth >= monitorWorkareaWidth) || (screenHeight >= monitorWorkareaHeight)) glfwSetWindowPos(CORE.Window.handle, monitorWorkareaX, monitorWorkareaY);
             else
             {
-                const int x = monitorWorkareaX + (monitorWorkareaWidth*0.5f) - (screenWidth*0.5f);
-                const int y = monitorWorkareaY + (monitorWorkareaHeight*0.5f) - (screenHeight*0.5f);
                 const int x = monitorWorkareaX + (monitorWorkareaWidth/2) - (screenWidth/2);
                 const int y = monitorWorkareaY + (monitorWorkareaHeight/2) - (screenHeight/2);
                 glfwSetWindowPos(CORE.Window.handle, x, y);
diff --git a/src/fmv.c b/src/fmv.c
index 262fc63..40efa8d 100644
--- a/src/fmv.c
+++ b/src/fmv.c
@@ -1,2 +1,11 @@
+#if defined(__GNUC__)
+	#pragma GCC diagnostic push
+	#pragma GCC diagnostic ignored "-Wtype-limits"
+#endif
+
 #define PL_MPEG_IMPLEMENTATION
-#include "plmpeg.h"
\ No newline at end of file
+#include "pl_mpeg.h"
+
+#if defined(__GNUC__)
+	#pragma GCC diagnostic pop
+#endif
\ No newline at end of file
diff --git a/tinycc/include/tccdefs.h b/tinycc/include/tccdefs.h
index f6c25a4..4e03cb9 100644
--- a/tinycc/include/tccdefs.h
+++ b/tinycc/include/tccdefs.h
@@ -193,7 +193,7 @@
     #define __builtin_va_copy(dest, src) (*(dest) = *(src))
 
 #else /* _WIN64 */
-    typedef char *__builtin_va_list;
+    typedef char* __builtin_va_list;
     #define __builtin_va_arg(ap, t) ((sizeof(t) > 8 || (sizeof(t) & (sizeof(t) - 1))) \
         ? **(t **)((ap += 8) - 8) : *(t  *)((ap += 8) - 8))
 #endif
@@ -322,4 +322,4 @@
     __BUILTIN_EXTERN(parity, unsigned)
     #undef __BUILTIN_EXTERN
 
-    #endif /* ndef __TCC_PP__ */
+    #endif /* ndef __TCC_PP__ */
\ No newline at end of file
diff --git a/tinycc/tccpp.c b/tinycc/tccpp.c
index eb37f41..717ab48 100644
--- a/tinycc/tccpp.c
+++ b/tinycc/tccpp.c
@@ -3661,14 +3661,6 @@ static void tcc_predefs(TCCState *s1, CString *cs, int is_asm)
     if (!is_asm) {
       putdef(cs, "__STDC__");
       cstr_printf(cs, "#define __STDC_VERSION__ %dL\n", s1->cversion);
-      cstr_cat(cs,
-        /* load more predefs and __builtins */
-#if CONFIG_TCC_PREDEFS
-        #include "include/tccdefs.h" /* include as strings */
-#else
-        "#include <tccdefs.h>\n" /* load at runtime */
-#endif
-        , -1);
     }
     cstr_printf(cs, "#define __BASE_FILE__ \"%s\"\n", file->filename);
 }