From b0147ec11e08564ca2b730260db4c7799180e721 Mon Sep 17 00:00:00 2001 From: scawful Date: Sat, 9 Jul 2022 16:56:14 -0400 Subject: [PATCH] Rename Library to lib --- .gitignore | 24 ++++++++++++------------ .gitmodules | 14 +++++++------- src/CMakeLists.txt | 10 +++++----- src/Library/ImGuiColorTextEdit | 1 - src/Library/ImGuiFileDialog | 1 - src/Library/imgui | 1 - src/Library/sneshacking | 1 - test/CMakeLists.txt | 4 ++-- 8 files changed, 26 insertions(+), 30 deletions(-) delete mode 160000 src/Library/ImGuiColorTextEdit delete mode 160000 src/Library/ImGuiFileDialog delete mode 160000 src/Library/imgui delete mode 160000 src/Library/sneshacking diff --git a/.gitignore b/.gitignore index 64ee3913..0c595f17 100644 --- a/.gitignore +++ b/.gitignore @@ -1,15 +1,15 @@ build/ .cache/ .vscode/ -src/Library/SDL2 -src/Library/cmake -src/Library/GL -src/Library/libGLEW.2.2.0.dylib -src/Library/libGLEW.2.2.dylib -src/Library/libGLEW.a -src/Library/libGLEW.dylib -src/Library/libSDL2_test.a -src/Library/libSDL2-2.0.0.dylib -src/Library/libSDL2.a -src/Library/libSDL2.dylib -src/Library/libSDL2main.a \ No newline at end of file +src/lib/SDL2 +src/lib/cmake +src/lib/GL +src/lib/libGLEW.2.2.0.dylib +src/lib/libGLEW.2.2.dylib +src/lib/libGLEW.a +src/lib/libGLEW.dylib +src/lib/libSDL2_test.a +src/lib/libSDL2-2.0.0.dylib +src/lib/libSDL2.a +src/lib/libSDL2.dylib +src/lib/libSDL2main.a \ No newline at end of file diff --git a/.gitmodules b/.gitmodules index b4b142cc..81a40c9c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,14 +1,14 @@ -[submodule "src/Library/imgui"] - path = src/Library/imgui +[submodule "src/lib/imgui"] + path = src/lib/imgui url = https://github.com/ocornut/imgui.git -[submodule "src/Library/ImGuiFileDialog"] - path = src/Library/ImGuiFileDialog +[submodule "src/lib/ImGuiFileDialog"] + path = src/lib/ImGuiFileDialog url = https://github.com/aiekick/ImGuiFileDialog.git -[submodule "src/Library/ImGuiColorTextEdit"] +[submodule "src/lib/ImGuiColorTextEdit"] path = src/Library/ImGuiColorTextEdit url = https://github.com/BalazsJako/ImGuiColorTextEdit.git -[submodule "src/Library/sneshacking"] - path = src/Library/sneshacking +[submodule "src/lib/sneshacking"] + path = src/lib/sneshacking url = https://github.com/Skarsnik/sneshacking.git [submodule "assets/asm/alttp-hacker-workspace"] path = assets/asm/alttp-hacker-workspace diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5c3f7396..92a86d97 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -8,26 +8,26 @@ find_package(OpenGL REQUIRED) find_package(GLEW REQUIRED) # gui libraries --------------------------------------------------------------------------------------------------- -set(IMGUI_PATH "Library/imgui") +set(IMGUI_PATH "lib/imgui") file(GLOB IMGUI_SOURCES ${IMGUI_PATH}/*.cpp) add_library("ImGui" STATIC ${IMGUI_SOURCES}) target_include_directories("ImGui" PUBLIC ${IMGUI_PATH}) target_include_directories(ImGui PUBLIC ${SDL2_INCLUDE_DIR}) target_compile_definitions(ImGui PUBLIC IMGUI_IMPL_OPENGL_LOADER_CUSTOM= GL_GLEXT_PROTOTYPES=1) -set(IMGUI_FILE_DLG_PATH "Library/ImGuiFileDialog") +set(IMGUI_FILE_DLG_PATH "lib/ImGuiFileDialog") file(GLOB IMGUI_FILE_DLG_SOURCES ${IMGUI_FILE_DLG_PATH}/*.cpp) add_library("ImGuiFileDialog" STATIC ${IMGUI_FILE_DLG_SOURCES}) target_include_directories(ImGuiFileDialog PUBLIC ${IMGUI_PATH}) target_compile_definitions(ImGuiFileDialog PUBLIC IMGUI_IMPL_OPENGL_LOADER_CUSTOM= GL_GLEXT_PROTOTYPES=1) -set(IMGUI_COLOR_TEXT_EDIT_PATH "Library/ImGuiColorTextEdit") +set(IMGUI_COLOR_TEXT_EDIT_PATH "lib/ImGuiColorTextEdit") file(GLOB IMGUI_COLOR_TEXT_EDIT_SOURCES ${IMGUI_COLOR_TEXT_EDIT_PATH}/*.cpp) add_library("ImGuiColorTextEdit" STATIC ${IMGUI_COLOR_TEXT_EDIT_SOURCES}) target_include_directories(ImGuiColorTextEdit PUBLIC ${IMGUI_PATH}) target_compile_definitions(ImGuiColorTextEdit PUBLIC IMGUI_IMPL_OPENGL_LOADER_CUSTOM= GL_GLEXT_PROTOTYPES=1) -set(SNESHACKING_PATH "Library/sneshacking/src") +set(SNESHACKING_PATH "lib/sneshacking/src") file(GLOB SNESHACKING_SOURCES ${SNESHACKING_PATH}/*.c) add_library("NintendoCompression" STATIC ${SNESHACKING_SOURCES}) target_include_directories(NintendoCompression PUBLIC "/usr/local/Cellar/libpng/1.6.37/include/libpng16") @@ -72,7 +72,7 @@ add_executable( target_include_directories( yaze PUBLIC ${CMAKE_SOURCE_DIR}/src/ - Library/ + lib/ app/ "C:/msys64/mingw64/include/libpng16" "C:/msys64/mingw64/include/SDL2" diff --git a/src/Library/ImGuiColorTextEdit b/src/Library/ImGuiColorTextEdit deleted file mode 160000 index 0a88824f..00000000 --- a/src/Library/ImGuiColorTextEdit +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0a88824f7de8d0bd11d8419066caa7d3469395c4 diff --git a/src/Library/ImGuiFileDialog b/src/Library/ImGuiFileDialog deleted file mode 160000 index 25780cf7..00000000 --- a/src/Library/ImGuiFileDialog +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 25780cf76e9899c0f5a43d274ca0b0639ab7c9f6 diff --git a/src/Library/imgui b/src/Library/imgui deleted file mode 160000 index 9aae45eb..00000000 --- a/src/Library/imgui +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9aae45eb4a05a5a1f96be1ef37eb503a12ceb889 diff --git a/src/Library/sneshacking b/src/Library/sneshacking deleted file mode 160000 index 3cf5ab86..00000000 --- a/src/Library/sneshacking +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3cf5ab8681839e37c0aa7b8209821b809f47e9c7 diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 8609d344..bb9735eb 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -12,7 +12,7 @@ enable_testing() find_package(PNG REQUIRED) find_package(SDL2 REQUIRED) -set(SNESHACKING_PATH "../src/Library/sneshacking/src") +set(SNESHACKING_PATH "../src/lib/sneshacking/src") add_executable( yaze_test @@ -31,7 +31,7 @@ add_executable( target_include_directories( yaze_test PUBLIC - ../src/Library/ + ../src/lib/ ../src/ ${SNESHACKING_PATH} ${SDL_INCLUDE_DIRS}