v1 release

1 files changed, 46 insertions, 34 deletions

diff --git a/build.sh b/build.sh
index 69bb75d..f4fb702 100755
--- a/build.sh
+++ b/build.sh
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-ARM=0               # Compile on ARM machines.
-
 OPTIMIZATION="-O2"  # Enable optimization.
 DEBUG=0             # Compile with debug UI.
 IMGUI=1             # Compile ImGui libs. Our custom ImGui functions still compile on zero.
@@ -46,43 +44,48 @@ WARNING_FLAGS="
 "
 
 if [[ "$DEBUG" == 1 ]]; then
-WARNING_FLAGS="$WARNING_FLAGS -DDEBUG=1"
+    WARNING_FLAGS="$WARNING_FLAGS -DDEBUG=1"
 fi
 if [[ "$THREADED" == 1 ]]; then
-WARNING_FLAGS="$WARNING_FLAGS -DTHREADED=1"
-fi
-if [[ "$ARM" == 1 ]]; then
-WARNING_FLAGS="$WARNING_FLAGS -DARM=1"
-ADDITIONAL_FLAGS="
-    -march=armv8.5-a+sve
-"
-else
-ADDITIONAL_FLAGS="
-    -march=native
-"
+    WARNING_FLAGS="$WARNING_FLAGS -DTHREADED=1"
 fi
 if [[ "$PERF" == 1 ]]; then
-WARNING_FLAGS="$WARNING_FLAGS -DPERF=1"
+    WARNING_FLAGS="$WARNING_FLAGS -DPERF=1"
 fi
 if [[ "$STABLE" == 1 ]]; then
-WARNING_FLAGS="$WARNING_FLAGS -DSTABLE=1"
-OPTIONAL_FLAGS="$OPTIONAL_FLAGS -lcurl"
+    WARNING_FLAGS="$WARNING_FLAGS -DSTABLE=1"
+    OPTIONAL_FLAGS="$OPTIONAL_FLAGS -lcurl"
 fi
 
-if [[ "$OSTYPE" =~ ^darwin ]]; then
-IMGUI_FLAGS="
-    -std=c++11 -Iimgui -Iimgui/backends $OPTIMIZATION -Wall -Wformat `sdl2-config --cflags` -I/usr/local/include -I/opt/local/include -c
-"
+
+if [[ "$(uname -m)" == "x86_64" ]]; then
+    ARCHNAME="x86"
+    ADDITIONAL_FLAGS="
+        -march=native
+    "
 else
-IMGUI_FLAGS="
-    -Iimgui -Iimgui/backends $OPTIMIZATION -Wall -Wformat `sdl2-config --cflags` -c
-"
+    ARCHNAME="arm"
+    ADDITIONAL_FLAGS="
+        -march=armv8.5-a+sve
+    "
+    WARNING_FLAGS="$WARNING_FLAGS -DARM=1"
 fi
-
 if [[ "$OSTYPE" =~ ^darwin ]]; then
-    SDL_ARGS="`sdl2-config --cflags` -framework OpenGL -ldl `sdl2-config --libs`"
+    OSNAME="mac"
+    IMGUI_FLAGS="
+        -std=c++11 -Iimgui -Iimgui/backends $OPTIMIZATION -Wall -Wformat `sdl2-config --cflags` -I/usr/local/include -I/opt/local/include -c
+    "
+    SDL_ARGS="
+        `sdl2-config --cflags` -framework OpenGL -ldl `sdl2-config --libs`
+    "
 else
-    SDL_ARGS="`sdl2-config --cflags` -lGL -ldl `sdl2-config --libs`"
+    OSNAME="linux"
+    IMGUI_FLAGS="
+        -Iimgui -Iimgui/backends $OPTIMIZATION -Wall -Wformat `sdl2-config --cflags` -c
+    "
+    SDL_ARGS="
+        `sdl2-config --cflags` -lGL -ldl `sdl2-config --libs`
+    "
 fi
 
 GLAD_FLAGS="
@@ -106,10 +109,19 @@ fi
 
 clang lib/glad.c $GLAD_FLAGS  -I/usr/local/include -I/opt/local/include -c  \
     $WARNING_FLAGS $OPTIMIZATION $ADDITIONAL_FLAGS -o bin/glad.o
-clang main.cpp  $WARNING_FLAGS $OPTIMIZATION $ADDITIONAL_FLAGS -o bin/real2d bin/*.o  \
-   $GLAD_FLAGS \
-   -std=c++11 -lstdc++ -Iimgui -Iimgui/backends  \
-   $SDL_ARGS \
-   $OPTIONAL_FLAGS \
-   -I . \
-   -lm -I /usr/local/include $(pkg-config --cflags --libs $FFMPEG_LIBS)
+clang main.cpp  $WARNING_FLAGS $OPTIMIZATION $ADDITIONAL_FLAGS -o bin/real2d_"$ARCHNAME"_"$OSNAME" bin/*.o  \
+    $GLAD_FLAGS \
+    -std=c++11 -lstdc++ -Iimgui -Iimgui/backends  \
+    $SDL_ARGS \
+    $OPTIONAL_FLAGS \
+    -I . \
+    -lm -I /usr/local/include # $(pkg-config --cflags --libs $FFMPEG_LIBS)
+
+
+if [[ "$OSTYPE" =~ ^darwin ]]; then
+mv bin/real2d_"$ARCHNAME"_"$OSNAME" lib/mac_app_template/Contents/MacOS/real
+mkdir bin/real_"$ARCHNAME".app
+cp -r lib/mac_app_template/Contents bin/real_"$ARCHNAME".app
+xattr -cr bin/real_"$ARCHNAME".app
+dylibbundler -od -b -x bin/real_"$ARCHNAME".app/Contents/MacOS/real -d bin/real_"$ARCHNAME".app/Contents/libs
+fi