diff options
| -rw-r--r-- | .gitmodules | 4 | ||||
| -rwxr-xr-x | build.sh | 4 | ||||
| m--------- | imgui | 0 | ||||
| -rw-r--r-- | main.cpp | 14 |
4 files changed, 14 insertions, 8 deletions
diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..76917ac --- /dev/null +++ b/.gitmodules @@ -0,0 +1,4 @@ +[submodule "docking"] + path = imgui + url = https://github.com/ocornut/imgui + branch = docking @@ -1,6 +1,6 @@ #!/bin/bash -WINDOWS=1 +WINDOWS=0 if [[ "$WINDOWS" == 1 ]]; then @@ -73,6 +73,8 @@ else SDL_ARGS="`sdl2-config --cflags` -lGL -ldl `sdl2-config --libs`" fi +# imgui + if [[ "$WINDOWS" == 1 ]]; then clang++ $WARNING_FLAGS -g -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 \ diff --git a/imgui b/imgui new file mode 160000 +Subproject cb8ead1f7198924f97e52973d115e1d4eaeda2f @@ -316,13 +316,13 @@ int main(int argc, char *argv[]) { ui UI = {}; - File.NumberOfSources = 2; - File.Source[0] = (char *)AllocateMemory(&Memory, STRING_SIZE, F_Strings); - File.Source[1] = (char *)AllocateMemory(&Memory, STRING_SIZE, F_Strings); - sprintf(File.Source[0], "../asset/b.jpg"); - sprintf(File.Source[1], "../asset/24.mp4"); - CreateLayerFromSource(&File, &State, &Memory, File.Source[0]); - CreateLayerFromSource(&File, &State, &Memory, File.Source[1]); + // File.NumberOfSources = 2; + // File.Source[0] = (char *)AllocateMemory(&Memory, STRING_SIZE, F_Strings); + // File.Source[1] = (char *)AllocateMemory(&Memory, STRING_SIZE, F_Strings); + // sprintf(File.Source[0], "../asset/b.jpg"); + // sprintf(File.Source[1], "../asset/24.mp4"); + // CreateLayerFromSource(&File, &State, &Memory, File.Source[0]); + // CreateLayerFromSource(&File, &State, &Memory, File.Source[1]); #if 1 // shm_unlink("/testl"); |