Collapsed milepost/ext into ext

milepost/ext/GLES3/gl3platform.h

@@ -1,27 +0,0 @@
-#ifndef __gl3platform_h_
-#define __gl3platform_h_
-
-/*
-** Copyright 2017-2020 The Khronos Group Inc.
-** SPDX-License-Identifier: Apache-2.0
-*/
-
-/* Platform-specific types and definitions for OpenGL ES 3.X  gl3.h
- *
- * Adopters may modify khrplatform.h and this file to suit their platform.
- * Please contribute modifications back to Khronos as pull requests on the
- * public github repository:
- *      https://github.com/KhronosGroup/OpenGL-Registry
- */
-
-#include <KHR/khrplatform.h>
-
-#ifndef GL_APICALL
-#define GL_APICALL  KHRONOS_APICALL
-#endif
-
-#ifndef GL_APIENTRY
-#define GL_APIENTRY KHRONOS_APIENTRY
-#endif
-
-#endif /* __gl3platform_h_ */

milepost/src/graphics_common.c

@@ -15,10 +15,10 @@
 	#define STBI_NO_STDIO
 	#define STBI_NO_HDR
 #endif
-#include"stb_image.h"
+#include"ext/stb_image.h"
 
 #define STB_TRUETYPE_IMPLEMENTATION
-#include"stb_truetype.h"
+#include"ext/stb_truetype.h"
 
 #include"platform/platform_log.h"
 #include"platform/platform_assert.h"

samples/glesTriangle/build.sh

@@ -11,6 +11,7 @@ else
   CLANG=clang
 fi
 
+ORCA_DIR=../..
 STDLIB_DIR=../../cstdlib
 ORCA_SDK_DIR=../../sdk
 MILEPOST_DIR=../../milepost
@@ -26,7 +27,8 @@ wasmFlags="--target=wasm32 \
   -D__ORCA__ \
   -I $STDLIB_DIR/include \
   -I $ORCA_SDK_DIR \
-  -I $MILEPOST_DIR/ext -I $MILEPOST_DIR -I $MILEPOST_DIR/src"
+  -I $ORCA_DIR \
+  -I $MILEPOST_DIR -I $MILEPOST_DIR/src"
 
 $CLANG $wasmFlags -o ./module.wasm ../../sdk/orca.c ../../cstdlib/src/*.c src/main.c
 

scripts/dev.py

@@ -118,6 +118,7 @@ def build_milepost_lib_win(release):
         "/I", "src/util",
         "/I", "src/platform",
         "/I", "ext",
+        "/I", "../ext"
         "/I", "../ext/angle/include",
     ]
     libs = [
@@ -160,7 +161,7 @@ def build_milepost_lib_mac(release):
     cflags = ["-std=c11"]
     debug_flags = ["-O3"] if release else ["-g", "-DDEBUG", "-DLOG_COMPILE_DEBUG"]
     ldflags = [f"-L{sdk_dir}/usr/lib", f"-F{sdk_dir}/System/Library/Frameworks/"]
-    includes = ["-Isrc", "-Isrc/util", "-Isrc/platform", "-Iext", "-I../ext/angle/include"]
+    includes = ["-Isrc", "-Isrc/util", "-Isrc/platform", "-Iext", "-I../ext", "-I../ext/angle/include"]
 
     # compile metal shader
     subprocess.run([
@@ -305,9 +306,9 @@ def build_orca_win(release):
     includes = [
         "/I", "src",
         "/I", "sdk",
+        "/I", "ext"
         "/I", "ext/wasm3/source",
-        "/I", "milepost/src",
+        "/I", "milepost/src"
-        "/I", "milepost/ext",
     ]
     libs = [
         "/LIBPATH:build/bin",
@@ -339,8 +340,8 @@ def build_orca_mac(release):
         "-Imilepost/src",
         "-Imilepost/src/util",
         "-Imilepost/src/platform",
-        "-Iext/wasm3/source",
+        "-Iext",
-        "-Imilepost/ext/",
+        "-Iext/wasm3/source"
     ]
     libs = ["-Lbuild/bin", "-Lbuild/lib", "-lmilepost", "-lwasm3"]
     debug_flags = ["-O2"] if release else ["-g", "-DLOG_COMPILE_DEBUG"]
@@ -377,7 +378,7 @@ def gen_all_bindings():
         wasm3_bindings="src/core_api_bind_gen.c",
     )
 
-    gles_gen("milepost/ext/gl.xml",
+    gles_gen("ext/gl.xml",
         "src/gles_api.json",
         "sdk/gl31.h"
     )