large changes to bitmap structure

1 files changed, 20 insertions, 13 deletions

diff --git a/build.sh b/build.sh
index 35ac264..433bfc6 100755
--- a/build.sh
+++ b/build.sh
@@ -26,12 +26,17 @@ 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="
-    imgui
-    imgui_demo
-    imgui_draw
-    imgui_tables
-    imgui_widgets
+    my_imgui_internal_widgets
 "
 
 IMGUI_FILES_IMPL="
@@ -51,12 +56,12 @@ fi
 imgui() {
     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
+        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
@@ -65,7 +70,9 @@ else
     SDL_ARGS="`sdl2-config --cflags` -lGL -ldl `sdl2-config --libs`"
 fi
 
-# imgui
+imgui
+
+   # -lm $(pkg-config --cflags --libs $FFMPEG_LIBS) -MJresult.json
 
 if [[ "$WINDOWS" == 1 ]]; then
 clang++ -g $WARNING_FLAGS -target x86_64-pc-windows-gnu -march=x86-64-v3 -I .. -Iimgui -Iimgui/backends \
@@ -74,9 +81,9 @@ clang++ -g $WARNING_FLAGS -target x86_64-pc-windows-gnu -march=x86-64-v3 -I .. -
     -lmingw32 -lopengl32 -lSDL2main -lSDL2 -llibavcodec -llibswscale -llibavformat -llibavutil \
     -o bin/real2d
 else
-clang main.cpp $WARNING_FLAGS -g -O0 -march=native -o bin/real2d bin/*.o  \
+clang main.cpp $WARNING_FLAGS -g -march=native -o bin/real2d bin/*.o  \
    -std=c++11 -lstdc++ -Iimgui -Iimgui/backends  \
    $SDL_ARGS \
    -I . \
-   -lm $(pkg-config --cflags --libs $FFMPEG_LIBS)
+   -lm -I /usr/local/include ~/.local/src/ffmpeg/bin/*.so
 fi