v3, file/build organization

1 files changed, 14 insertions, 24 deletions

diff --git a/build.sh b/build.sh
index 750146b..f826b87 100755
--- a/build.sh
+++ b/build.sh
@@ -12,7 +12,6 @@ if test -f build_ops; then
 fi
 
 FFMPEG_LIBS="
-    libavdevice
     libavformat
     libavfilter
     libavcodec
@@ -27,9 +26,6 @@ IMGUI_FILES="
     imgui_draw
     imgui_tables
     imgui_widgets
-"
-
-IMGUI_FILES_IMPL="
     imgui_impl_sdl
     imgui_impl_opengl3
 "
@@ -70,53 +66,47 @@ else
     "
     WARNING_FLAGS="$WARNING_FLAGS -DARM=1"
 fi
+
+IMGUI_FLAGS="
+    -Idependencies/include/imgui -Idependencies/ $OPTIMIZATION -Wall -Wformat `sdl2-config --cflags` -c
+"
+
 if [[ "$OSTYPE" =~ ^darwin ]]; then
     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
+        $IMGUI_FLAGS -std=c++11 -I/usr/local/include -I/opt/local/include -c
     "
     SDL_ARGS="
         `sdl2-config --cflags` -framework OpenGL -ldl `sdl2-config --libs`
     "
 else
     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="
-    -Ilib/glad/include
-"
-
 [[ -d bin ]] || mkdir bin
 
-clang $IMGUI_FLAGS -o bin/my_imgui_internal_widgets.o my_imgui_internal_widgets.cpp
+clang $IMGUI_FLAGS -Isrc/include -o bin/imgui_helper_internal.o src/imgui_helper_internal.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
+        clang $IMGUI_FLAGS -o bin/$i.o dependencies/src/imgui/$i.cpp
     done
 fi
 
-clang lib/glad.c $GLAD_FLAGS  -I/usr/local/include -I/opt/local/include -c  \
+clang dependencies/src/glad.c -Idependencies/include -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_"$ARCHNAME"_"$OSNAME" bin/*.o  \
-    $GLAD_FLAGS \
-    -std=c++11 -lstdc++ -Iimgui -Iimgui/backends  \
+
+clang src/main.cpp  $WARNING_FLAGS $OPTIMIZATION $ADDITIONAL_FLAGS -o bin/real2d_"$ARCHNAME"_"$OSNAME" bin/*.o  \
+    -Idependencies/include -Idependencies/include/imgui -Idependencies/src -Isrc/include \
+    -std=c++11 -lstdc++   \
     $SDL_ARGS \
     $OPTIONAL_FLAGS \
     -I . \
-    -lm -I /usr/local/include # $(pkg-config --cflags --libs $FFMPEG_LIBS)
-
+    -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