remove the need for defining __ORCA__ when compiling wasm module

orca-app · Apr 9, 2024 · c774ce1 · c774ce1
1 parent 1c4c921
commit c774ce1
Show file tree

Hide file tree

Showing 13 changed files with 3 additions and 95 deletions.
diff --git a/samples/breakout/build.bat b/samples/breakout/build.bat
@@ -7,7 +7,6 @@ for /f %%i in ('orca sdk-path') do set ORCA_DIR=%%i
 set wasmFlags=--target=wasm32^
        -mbulk-memory ^
        -g -O2 ^
-       -D__ORCA__ ^
        -Wl,--no-entry ^
        -Wl,--export-dynamic ^
        --sysroot %ORCA_DIR%/orca-libc ^

diff --git a/samples/breakout/build.sh b/samples/breakout/build.sh
@@ -8,7 +8,6 @@ ORCA_DIR=$(orca sdk-path)
 wasmFlags=(--target=wasm32 \
   -mbulk-memory \
   -g -O2 \
-  -D__ORCA__ \
   -Wl,--no-entry \
   -Wl,--export-dynamic \
   --sysroot "$ORCA_DIR"/orca-libc \

diff --git a/samples/clock/build.bat b/samples/clock/build.bat
@@ -7,7 +7,6 @@ for /f %%i in ('orca sdk-path') do set ORCA_DIR=%%i
 set wasmFlags=--target=wasm32^
        -mbulk-memory ^
        -g -O2 ^
-       -D__ORCA__ ^
        -Wl,--no-entry ^
        -Wl,--export-dynamic ^
        --sysroot %ORCA_DIR%/orca-libc ^

diff --git a/samples/clock/build.sh b/samples/clock/build.sh
@@ -8,7 +8,6 @@ ORCA_DIR=$(orca sdk-path)
 wasmFlags=(--target=wasm32 \
   -mbulk-memory \
   -g -O2 \
-  -D__ORCA__ \
   -Wl,--no-entry \
   -Wl,--export-dynamic \
   --sysroot "$ORCA_DIR"/orca-libc \

diff --git a/samples/clock/build_cpp.sh b/samples/clock/build_cpp.sh
diff --git a/samples/fluid/build.bat b/samples/fluid/build.bat
@@ -24,7 +24,6 @@ if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL!
 set wasmFlags=--target=wasm32^
        -mbulk-memory ^
        -g -O2 ^
-       -D__ORCA__ ^
        -Wl,--no-entry ^
        -Wl,--export-dynamic ^
        --sysroot %ORCA_DIR%/orca-libc ^

diff --git a/samples/fluid/build.sh b/samples/fluid/build.sh
@@ -10,7 +10,6 @@ python3 ../../scripts/embed_text_files.py --prefix=glsl_ --output src/glsl_shade
 wasmFlags=(--target=wasm32 \
   -mbulk-memory \
   -g -O2 \
-  -D__ORCA__ \
   -Wl,--no-entry \
   -Wl,--export-dynamic \
   --sysroot "$ORCA_DIR"/orca-libc \

diff --git a/samples/triangle/build.bat b/samples/triangle/build.bat
@@ -7,7 +7,6 @@ for /f %%i in ('orca sdk-path') do set ORCA_DIR=%%i
 set wasmFlags=--target=wasm32^
        -mbulk-memory ^
        -g -O2 ^
-       -D__ORCA__ ^
        -Wl,--no-entry ^
        -Wl,--export-dynamic ^
        --sysroot %ORCA_DIR%/orca-libc ^

diff --git a/samples/triangle/build.sh b/samples/triangle/build.sh
@@ -8,7 +8,6 @@ ORCA_DIR=$(orca sdk-path)
 wasmFlags=(--target=wasm32 \
   -mbulk-memory \
   -g -O2 \
-  -D__ORCA__ \
   -Wl,--no-entry \
   -Wl,--export-dynamic \
   --sysroot "$ORCA_DIR"/orca-libc \

diff --git a/samples/ui/build.bat b/samples/ui/build.bat
@@ -7,7 +7,6 @@ for /f %%i in ('orca sdk-path') do set ORCA_DIR=%%i
 set wasmFlags=--target=wasm32^
        -mbulk-memory ^
        -g -O2 ^
-       -D__ORCA__ ^
        -Wl,--no-entry ^
        -Wl,--export-dynamic ^
        --sysroot %ORCA_DIR%/orca-libc ^

diff --git a/samples/ui/build.sh b/samples/ui/build.sh
@@ -8,7 +8,6 @@ ORCA_DIR=$(orca sdk-path)
 wasmFlags=(--target=wasm32 \
   -mbulk-memory \
   -g -O2 \
-  -D__ORCA__ \
   -Wl,--no-entry \
   -Wl,--export-dynamic \
   --sysroot "$ORCA_DIR"/orca-libc \

diff --git a/src/orca-libc/build.sh b/src/orca-libc/build.sh
diff --git a/src/platform/platform.h b/src/platform/platform.h
@@ -34,12 +34,12 @@
 #if defined(_WIN64)
     #define OC_PLATFORM_WINDOWS 1
 #elif defined(_WIN32)
-	#error "Unsupported OS (32bit only version of Windows)"
+    #error "Unsupported OS (32bit only version of Windows)"
 #elif defined(__APPLE__) && defined(__MACH__)
     #define OC_PLATFORM_MACOS 1
 #elif defined(__gnu_linux__)
     #define PLATFORM_LINUX 1
-#elif defined(__ORCA__)
+#elif defined(__wasm__)
     #define OC_PLATFORM_ORCA 1
 #else
     #error "Can't identify platform"
@@ -69,7 +69,7 @@
         #define OC_ARCH_ARM32 1
     #elif defined(__aarch64__)
         #define OC_ARCH_ARM64 1
-    #elif defined(__ORCA__)
+    #elif defined(__wasm32__)
         #define OC_ARCH_WASM32 1
     #else
         #error "Can't identify architecture"