[#26]: Unify directories names for dependencies

JacobDomagala · Aug 1, 2021 · e24a336 · e24a336
1 parent 1cdc703
commit e24a336
Show file tree

Hide file tree

Showing 58 changed files with 42 additions and 43 deletions.
diff --git a/.gitignore b/.gitignore
@@ -308,11 +308,11 @@ paket-files/
 # Project specific folders
 build
 .vscode
-dependencies/Freetype/Freetype*
-dependencies/GLM/glm*
-dependencies/STB_IMAGE/STB_IMAGE*
-dependencies/JSON/JSON*
-dependencies/FMT/FMT*
-dependencies/Imgui/IMGUI*
-dependencies/glfw/GLFW*
+dependencies/freetype/freetype*
+dependencies/glm/glm*
+dependencies/stb_image/stb_image*
+dependencies/json/json*
+dependencies/fmt/fmt*
+dependencies/imgui/imgui*
+dependencies/glfw/glfw*
 *imgui.ini
diff --git a/Assets/Fonts/segoeui.ttf → assets/Fonts/segoeui.ttf b/Assets/Fonts/segoeui.ttf → assets/Fonts/segoeui.ttf
diff --git a/Assets/GameInit.txt → assets/GameInit.txt b/Assets/GameInit.txt → assets/GameInit.txt
diff --git a/Assets/Images/Default128.png → assets/Images/Default128.png b/Assets/Images/Default128.png → assets/Images/Default128.png
diff --git a/Assets/Images/Enemy.png → assets/Images/Enemy.png b/Assets/Images/Enemy.png → assets/Images/Enemy.png
diff --git a/Assets/Images/Level1.png → assets/Images/Level1.png b/Assets/Images/Level1.png → assets/Images/Level1.png
diff --git a/Assets/Images/Level1_Char.png → assets/Images/Level1_Char.png b/Assets/Images/Level1_Char.png → assets/Images/Level1_Char.png
diff --git a/Assets/Images/Level1_VectorField.png → assets/Images/Level1_VectorField.png b/Assets/Images/Level1_VectorField.png → assets/Images/Level1_VectorField.png
diff --git a/Assets/Images/Level1_collision.png → assets/Images/Level1_collision.png b/Assets/Images/Level1_collision.png → assets/Images/Level1_collision.png
diff --git a/Assets/Images/NodeSprite.png → assets/Images/NodeSprite.png b/Assets/Images/NodeSprite.png → assets/Images/NodeSprite.png
diff --git a/Assets/Images/house1.png → assets/Images/house1.png b/Assets/Images/house1.png → assets/Images/house1.png
diff --git a/Assets/Images/white.png → assets/Images/white.png b/Assets/Images/white.png → assets/Images/white.png
diff --git a/Assets/Levels/Level1/Default.png → assets/Levels/Level1/Default.png b/Assets/Levels/Level1/Default.png → assets/Levels/Level1/Default.png
diff --git a/Assets/Levels/Level1/Default128.png → assets/Levels/Level1/Default128.png b/Assets/Levels/Level1/Default128.png → assets/Levels/Level1/Default128.png
diff --git a/Assets/Levels/Level1/Defaultsmall.png → assets/Levels/Level1/Defaultsmall.png b/Assets/Levels/Level1/Defaultsmall.png → assets/Levels/Level1/Defaultsmall.png
diff --git a/Assets/Levels/Level1/Level1.png → assets/Levels/Level1/Level1.png b/Assets/Levels/Level1/Level1.png → assets/Levels/Level1/Level1.png
diff --git a/Assets/Levels/Level1/Level1.txt → assets/Levels/Level1/Level1.txt b/Assets/Levels/Level1/Level1.txt → assets/Levels/Level1/Level1.txt
diff --git a/Assets/Levels/Level1/Level1_Char.png → assets/Levels/Level1/Level1_Char.png b/Assets/Levels/Level1/Level1_Char.png → assets/Levels/Level1/Level1_Char.png
diff --git a/Assets/Levels/Level1/Level1_VectorField.png → assets/Levels/Level1/Level1_VectorField.png b/Assets/Levels/Level1/Level1_VectorField.png → assets/Levels/Level1/Level1_VectorField.png
diff --git a/...Levels/Level1/Level1_VectorFieldTest1.png → ...Levels/Level1/Level1_VectorFieldTest1.png b/...Levels/Level1/Level1_VectorFieldTest1.png → ...Levels/Level1/Level1_VectorFieldTest1.png
diff --git a/...Levels/Level1/Level1_VectorFieldTest2.png → ...Levels/Level1/Level1_VectorFieldTest2.png b/...Levels/Level1/Level1_VectorFieldTest2.png → ...Levels/Level1/Level1_VectorFieldTest2.png
diff --git a/Assets/Levels/Level1/Level1_collision.png → assets/Levels/Level1/Level1_collision.png b/Assets/Levels/Level1/Level1_collision.png → assets/Levels/Level1/Level1_collision.png
diff --git a/Assets/Levels/Level1/back.png → assets/Levels/Level1/back.png b/Assets/Levels/Level1/back.png → assets/Levels/Level1/back.png
diff --git a/Assets/Levels/TestLevel/Default.png → assets/Levels/TestLevel/Default.png b/Assets/Levels/TestLevel/Default.png → assets/Levels/TestLevel/Default.png
diff --git a/Assets/Levels/TestLevel/Default128.png → assets/Levels/TestLevel/Default128.png b/Assets/Levels/TestLevel/Default128.png → assets/Levels/TestLevel/Default128.png
diff --git a/Assets/Levels/TestLevel/Defaultsmall.png → assets/Levels/TestLevel/Defaultsmall.png b/Assets/Levels/TestLevel/Defaultsmall.png → assets/Levels/TestLevel/Defaultsmall.png
diff --git a/Assets/Levels/TestLevel/Level1.png → assets/Levels/TestLevel/Level1.png b/Assets/Levels/TestLevel/Level1.png → assets/Levels/TestLevel/Level1.png
diff --git a/Assets/Levels/TestLevel/Level1_Char.png → assets/Levels/TestLevel/Level1_Char.png b/Assets/Levels/TestLevel/Level1_Char.png → assets/Levels/TestLevel/Level1_Char.png
diff --git a/...s/Levels/TestLevel/Level1_VectorField.png → ...s/Levels/TestLevel/Level1_VectorField.png b/...s/Levels/TestLevel/Level1_VectorField.png → ...s/Levels/TestLevel/Level1_VectorField.png
diff --git a/Assets/Levels/TestLevel/Level1_collision.png → assets/Levels/TestLevel/Level1_collision.png b/Assets/Levels/TestLevel/Level1_collision.png → assets/Levels/TestLevel/Level1_collision.png
diff --git a/Assets/Levels/TestLevel/TestLevel.dgl → assets/Levels/TestLevel/TestLevel.dgl b/Assets/Levels/TestLevel/TestLevel.dgl → assets/Levels/TestLevel/TestLevel.dgl
diff --git a/Assets/Levels/TestLevel/test123.dgl → assets/Levels/TestLevel/test123.dgl b/Assets/Levels/TestLevel/test123.dgl → assets/Levels/TestLevel/test123.dgl
diff --git a/Assets/Shaders/AfterEffects_fs.glsl → assets/Shaders/AfterEffects_fs.glsl b/Assets/Shaders/AfterEffects_fs.glsl → assets/Shaders/AfterEffects_fs.glsl
diff --git a/Assets/Shaders/AfterEffects_vs.glsl → assets/Shaders/AfterEffects_vs.glsl b/Assets/Shaders/AfterEffects_vs.glsl → assets/Shaders/AfterEffects_vs.glsl
diff --git a/Assets/Shaders/DefaultShader_fs.glsl → assets/Shaders/DefaultShader_fs.glsl b/Assets/Shaders/DefaultShader_fs.glsl → assets/Shaders/DefaultShader_fs.glsl
diff --git a/Assets/Shaders/DefaultShader_vs.glsl → assets/Shaders/DefaultShader_vs.glsl b/Assets/Shaders/DefaultShader_vs.glsl → assets/Shaders/DefaultShader_vs.glsl
diff --git a/Assets/Shaders/Editor_fs.glsl → assets/Shaders/Editor_fs.glsl b/Assets/Shaders/Editor_fs.glsl → assets/Shaders/Editor_fs.glsl
diff --git a/Assets/Shaders/Editor_vs.glsl → assets/Shaders/Editor_vs.glsl b/Assets/Shaders/Editor_vs.glsl → assets/Shaders/Editor_vs.glsl
diff --git a/Assets/Shaders/Font_fs.glsl → assets/Shaders/Font_fs.glsl b/Assets/Shaders/Font_fs.glsl → assets/Shaders/Font_fs.glsl
diff --git a/Assets/Shaders/Font_vs.glsl → assets/Shaders/Font_vs.glsl b/Assets/Shaders/Font_vs.glsl → assets/Shaders/Font_vs.glsl
diff --git a/Assets/Shaders/LineShader_fs.glsl → assets/Shaders/LineShader_fs.glsl b/Assets/Shaders/LineShader_fs.glsl → assets/Shaders/LineShader_fs.glsl
diff --git a/Assets/Shaders/LineShader_vs.glsl → assets/Shaders/LineShader_vs.glsl b/Assets/Shaders/LineShader_vs.glsl → assets/Shaders/LineShader_vs.glsl
diff --git a/dependencies/CMakeLists.txt b/dependencies/CMakeLists.txt
@@ -30,12 +30,12 @@ function(FIND_AND_DOWNLOAD_ZIP_RESOURCE ResourceURL ResourceName Version)
    endif()
 endfunction()
 
-add_subdirectory(Glad)
+add_subdirectory(glad)
 add_subdirectory(glfw)
-add_subdirectory(Imgui)
-add_subdirectory(Freetype)
-add_subdirectory(STB_IMAGE)
-add_subdirectory(GLM)
-add_subdirectory(JSON)
-add_subdirectory(FMT)
+add_subdirectory(imgui)
+add_subdirectory(freetype)
+add_subdirectory(stb_image)
+add_subdirectory(glm)
+add_subdirectory(json)
+add_subdirectory(fmt)
 
diff --git a/dependencies/FMT/CMakeLists.txt b/dependencies/FMT/CMakeLists.txt
diff --git a/dependencies/Imgui/CMakeLists.txt b/dependencies/Imgui/CMakeLists.txt
diff --git a/dependencies/JSON/CMakeLists.txt b/dependencies/JSON/CMakeLists.txt
diff --git a/dependencies/STB_IMAGE/CMakeLists.txt b/dependencies/STB_IMAGE/CMakeLists.txt
diff --git a/dependencies/fmt/CMakeLists.txt b/dependencies/fmt/CMakeLists.txt
@@ -0,0 +1,2 @@
+FIND_AND_DOWNLOAD_GIT_RESOURCE(fmt https://github.com/fmtlib/fmt.git)
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/fmt)
diff --git a/dependencies/Freetype/CMakeLists.txt → dependencies/freetype/CMakeLists.txt b/dependencies/Freetype/CMakeLists.txt → dependencies/freetype/CMakeLists.txt
diff --git a/dependencies/Glad/CMakeLists.txt → dependencies/glad/CMakeLists.txt b/dependencies/Glad/CMakeLists.txt → dependencies/glad/CMakeLists.txt
@@ -1,8 +1,8 @@
 file(GLOB HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/include/glad/*.h" "${CMAKE_CURRENT_SOURCE_DIR}/include/KHR/*.h")
 file(GLOB SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.c")
 
-add_library(GLAD STATIC ${HEADERS} ${SOURCES} )
+add_library(glad STATIC ${HEADERS} ${SOURCES} )
 #target_sources(GLAD PUBLIC )
-target_include_directories(GLAD SYSTEM PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include/")
+target_include_directories(glad SYSTEM PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include/")
 # For linux we may need to add -ldl
 #target_link_libraries (GLAD INTERFACE opengl32)
diff --git a/dependencies/Glad/include/KHR/khrplatform.h → dependencies/glad/include/KHR/khrplatform.h b/dependencies/Glad/include/KHR/khrplatform.h → dependencies/glad/include/KHR/khrplatform.h
diff --git a/dependencies/Glad/include/glad/glad.h → dependencies/glad/include/glad/glad.h b/dependencies/Glad/include/glad/glad.h → dependencies/glad/include/glad/glad.h
diff --git a/dependencies/Glad/src/glad.c → dependencies/glad/src/glad.c b/dependencies/Glad/src/glad.c → dependencies/glad/src/glad.c
diff --git a/dependencies/GLM/CMakeLists.txt → dependencies/glm/CMakeLists.txt b/dependencies/GLM/CMakeLists.txt → dependencies/glm/CMakeLists.txt
diff --git a/dependencies/imgui/CMakeLists.txt b/dependencies/imgui/CMakeLists.txt
@@ -0,0 +1,15 @@
+FIND_AND_DOWNLOAD_GIT_RESOURCE(imgui https://github.com/ocornut/imgui.git)
+
+set(HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/imgui/imconfig.h" "${CMAKE_CURRENT_SOURCE_DIR}/imgui/imgui.h" "${CMAKE_CURRENT_SOURCE_DIR}/imgui/imgui_internal.h"
+            "${CMAKE_CURRENT_SOURCE_DIR}/imgui/imstb_rectpack.h" "${CMAKE_CURRENT_SOURCE_DIR}/imgui/imstb_textedit.h" "${CMAKE_CURRENT_SOURCE_DIR}/imgui/imstb_truetype.h"
+            "${CMAKE_CURRENT_SOURCE_DIR}/imgui/backends/imgui_impl_glfw.h" "${CMAKE_CURRENT_SOURCE_DIR}/imgui/backends/imgui_impl_opengl3.h")
+
+set(SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/imgui/imgui.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/imgui/imgui_demo.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/imgui/imgui_draw.cpp"
+            "${CMAKE_CURRENT_SOURCE_DIR}/imgui/imgui_tables.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/imgui/backends/imgui_impl_opengl3.cpp"
+            "${CMAKE_CURRENT_SOURCE_DIR}/imgui/backends/imgui_impl_glfw.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/imgui/imgui_widgets.cpp")
+
+add_library(imgui STATIC ${HEADERS} ${SOURCES})
+target_include_directories(imgui SYSTEM PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/imgui/" "${CMAKE_CURRENT_SOURCE_DIR}/imgui/backends")
+
+# Needed for backend code
+target_link_libraries(imgui PRIVATE glfw glad)
diff --git a/dependencies/json/CMakeLists.txt b/dependencies/json/CMakeLists.txt
@@ -0,0 +1,5 @@
+FIND_AND_DOWNLOAD_GIT_RESOURCE(json https://github.com/nlohmann/json.git)
+
+set(JSON_BuildTests OFF CACHE INTERNAL "")
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/json)
+
diff --git a/dependencies/stb_image/CMakeLists.txt b/dependencies/stb_image/CMakeLists.txt
@@ -0,0 +1,3 @@
+FIND_AND_DOWNLOAD_GIT_RESOURCE(stb_image https://github.com/nothings/stb.git)
+add_library(stb_image INTERFACE IMPORTED GLOBAL)
+target_include_directories(stb_image INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/stb_image")
diff --git a/engine/CMakeLists.txt b/engine/CMakeLists.txt
@@ -11,7 +11,7 @@ target_include_directories(${MODULE_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" "
                                           "${CMAKE_CURRENT_SOURCE_DIR}/Logger" "${CMAKE_CURRENT_SOURCE_DIR}/Render"
                                           "${CMAKE_CURRENT_SOURCE_DIR}/Time" "${CMAKE_CURRENT_SOURCE_DIR}/Window")
 
-target_link_libraries_system (${MODULE_NAME} PUBLIC glm glfw GLAD STB_IMAGE freetype nlohmann_json::nlohmann_json fmt IMGUI)
+target_link_libraries_system (${MODULE_NAME} PUBLIC glm glfw glad stb_image freetype nlohmann_json::nlohmann_json fmt imgui)
 target_link_libraries(${MODULE_NAME} PUBLIC project_warnings project_options)
 target_compile_features(${MODULE_NAME} PRIVATE cxx_std_20)