undo and pen development

1 files changed, 61 insertions, 47 deletions

diff --git a/build.sh b/build.sh
index a24dc3b..177dc3f 100755
--- a/build.sh
+++ b/build.sh
@@ -1,21 +1,10 @@
 #!/bin/bash
 
-WINDOWS=0
-
-WARNING_FLAGS="
-    -Wall -Wextra \
-    -Wno-unused-function -Wno-unused-variable -Wno-unused-parameter -Wno-unused-but-set-variable \
-    -Wno-missing-field-initializers -Wno-sign-compare -Wno-unused-but-set-parameter \
-    -Wno-missing-braces -Wno-format-security \
-    -fno-exceptions -Wno-strict-aliasing \
-    -Wno-write-strings
-    -DDEBUG=1 -DARM=0 -DTHREADED=1 \
-"
-
-if [[ "$WINDOWS" == 1 ]]; then
-WARNING_FLAGS="$WARNING_FLAGS -DWINDOWS=1"
-fi
-
+DEBUG=1             # Compile with debug symbols.
+IMGUI=0             # Compile ImGui libs. Our custom ImGui functions still compile on zero.
+THREADED=1          # Compile with threading. Useful to disable when stepping through the renderer.
+WINDOWS=0           # Compile for Windows with Mingw.
+ARM=0               # Compile on ARM machines.
 
 FFMPEG_LIBS="
     libavdevice
@@ -27,17 +16,12 @@ FFMPEG_LIBS="
     libavutil
 "
 
-# IMGUI_FILES="
-#     imgui/imgui
-#     imgui/imgui_demo
-#     imgui/imgui_draw
-#     imgui/imgui_tables
-#     imgui/imgui_widgets
-#     my_imgui_internal_widgets
-# "
-
 IMGUI_FILES="
-    my_imgui_internal_widgets
+    imgui
+    imgui_demo
+    imgui_draw
+    imgui_tables
+    imgui_widgets
 "
 
 IMGUI_FILES_IMPL="
@@ -45,25 +29,47 @@ IMGUI_FILES_IMPL="
     imgui_impl_opengl3
 "
 
+WARNING_FLAGS="
+    -Wall -Wextra \
+    -Wno-unused-function -Wno-unused-variable -Wno-unused-parameter -Wno-unused-but-set-variable \
+    -Wno-missing-field-initializers -Wno-sign-compare -Wno-unused-but-set-parameter \
+    -Wno-missing-braces -Wno-format-security \
+    -fno-exceptions -Wno-strict-aliasing \
+    -Wno-write-strings
+"
+
+if [[ "$DEBUG" == 1 ]]; then
+WARNING_FLAGS="$WARNING_FLAGS -DDEBUG=1"
+DEBUG="-g"
+else
+DEBUG="-O2"
+fi
+if [[ "$THREADED" == 1 ]]; then
+WARNING_FLAGS="$WARNING_FLAGS -DTHREADED=1"
+fi
+if [[ "$WINDOWS" == 1 ]]; then
+WARNING_FLAGS="$WARNING_FLAGS -DWINDOWS=1"
+fi
+if [[ "$ARM" == 1 ]]; then
+WARNING_FLAGS="$WARNING_FLAGS -DARM=1"
+ADDITIONAL_FLAGS="
+    -march=armv8.5-a+sve
+"
+else
+ADDITIONAL_FLAGS="
+    -march=native
+"
+fi
+
 if [[ "$OSTYPE" =~ ^darwin ]]; then
 IMGUI_FLAGS="
-    -std=c++11 -Iimgui -Iimgui/backends -g -Wall -Wformat `sdl2-config --cflags` -I/usr/local/include -I/opt/local/include -c
+    -std=c++11 -Iimgui -Iimgui/backends $DEBUG -Wall -Wformat `sdl2-config --cflags` -I/usr/local/include -I/opt/local/include -c
 "
 else
 IMGUI_FLAGS="
-    -Iimgui -Iimgui/backends -g -Wall -Wformat `sdl2-config --cflags` -c
+    -Iimgui -Iimgui/backends $DEBUG -Wall -Wformat `sdl2-config --cflags` -c
 "
 fi
-imgui() {
-    for i in $IMGUI_FILES
-    do
-        clang $IMGUI_FLAGS -o bin/$i.o $i.cpp
-    done
-#    for i in $IMGUI_FILES_IMPL
-#    do
-#        clang $IMGUI_FLAGS -o bin/$i.o imgui/backends/$i.cpp
-#    done
-}
 
 if [[ "$OSTYPE" =~ ^darwin ]]; then
     SDL_ARGS="`sdl2-config --cflags` -framework OpenGL -ldl `sdl2-config --libs`"
@@ -71,29 +77,37 @@ else
     SDL_ARGS="`sdl2-config --cflags` -lGL -ldl `sdl2-config --libs`"
 fi
 
-imgui
-
 GLAD_FLAGS="
     -Ilib/glad/include
 "
 
-   # -lm $(pkg-config --cflags --libs $FFMPEG_LIBS) -MJresult.json
+
+clang $IMGUI_FLAGS -o bin/my_imgui_internal_widgets.o my_imgui_internal_widgets.cpp
+
+if [[ "$IMGUI" == 1 ]]; then
+    for i in $IMGUI_FILES
+    do
+        clang $IMGUI_FLAGS -o bin/$i.o imgui/$i.cpp
+    done
+    for i in $IMGUI_FILES_IMPL
+    do
+        clang $IMGUI_FLAGS -o bin/$i.o imgui/backends/$i.cpp
+    done
+fi
 
 if [[ "$WINDOWS" == 1 ]]; then
-clang++ -g $WARNING_FLAGS -target x86_64-pc-windows-gnu -march=x86-64-v3 -I .. -Iimgui -Iimgui/backends \
+clang++ $DEBUG $WARNING_FLAGS -target x86_64-pc-windows-gnu -march=x86-64-v3 -I .. -Iimgui -Iimgui/backends \
     main.cpp imgui/imgui*.cpp imgui/backends/imgui_impl_sdl.cpp imgui/backends/imgui_impl_opengl3.cpp \
     -I/usr/x86_64-w64-mingw32/include/SDL2 -I/usr/x86_64-w64-mingw32/include/GL  \
     -lmingw32 -lopengl32 -lSDL2main -lSDL2 -llibavcodec -llibswscale -llibavformat -llibavutil \
     -o bin/real2d
 else
 clang lib/glad.c $GLAD_FLAGS  -I/usr/local/include -I/opt/local/include -c  \
-    $WARNING_FLAGS -g -march=native -o bin/glad.o
-# clang gl_calls.cpp $GLAD_FLAGS  -I/usr/local/include -I/opt/local/include -c  \
-#     $WARNING_FLAGS -g -march=native -o bin/gl.o
-clang main.cpp  $WARNING_FLAGS -g -march=native -o bin/real2d bin/*.o  \
+    $WARNING_FLAGS $DEBUG $ADDITIONAL_FLAGS -o bin/glad.o
+clang main.cpp  $WARNING_FLAGS $DEBUG $ADDITIONAL_FLAGS -o bin/real2d bin/*.o  \
    $GLAD_FLAGS \
    -std=c++11 -lstdc++ -Iimgui -Iimgui/backends  \
    $SDL_ARGS \
    -I . \
-   -lm -I /usr/local/include ~/.local/src/ffmpeg/bin/*.so
+   -lm -I /usr/local/include $(pkg-config --cflags --libs $FFMPEG_LIBS)
 fi