scawful/yaze
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename Library to lib

Browse Source
This commit is contained in:
scawful
2022-07-09 16:56:14 -04:00
parent 48baed1294
commit b0147ec11e
8 changed files with 26 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
.gitignore vendored
View File

@@ -1,15 +1,15 @@
build/ build/
.cache/ .cache/
.vscode/ .vscode/
src/Library/SDL2 src/lib/SDL2
src/Library/cmake src/lib/cmake
src/Library/GL src/lib/GL
src/Library/libGLEW.2.2.0.dylib src/lib/libGLEW.2.2.0.dylib
src/Library/libGLEW.2.2.dylib src/lib/libGLEW.2.2.dylib
src/Library/libGLEW.a src/lib/libGLEW.a
src/Library/libGLEW.dylib src/lib/libGLEW.dylib
src/Library/libSDL2_test.a src/lib/libSDL2_test.a
src/Library/libSDL2-2.0.0.dylib src/lib/libSDL2-2.0.0.dylib
src/Library/libSDL2.a src/lib/libSDL2.a
src/Library/libSDL2.dylib src/lib/libSDL2.dylib
src/Library/libSDL2main.a src/lib/libSDL2main.a

14
.gitmodules vendored
View File

@@ -1,14 +1,14 @@
[submodule "src/Library/imgui"] [submodule "src/lib/imgui"]
path = src/Library/imgui path = src/lib/imgui
url = https://github.com/ocornut/imgui.git url = https://github.com/ocornut/imgui.git
[submodule "src/Library/ImGuiFileDialog"] [submodule "src/lib/ImGuiFileDialog"]
path = src/Library/ImGuiFileDialog path = src/lib/ImGuiFileDialog
url = https://github.com/aiekick/ImGuiFileDialog.git url = https://github.com/aiekick/ImGuiFileDialog.git
[submodule "src/Library/ImGuiColorTextEdit"] [submodule "src/lib/ImGuiColorTextEdit"]
path = src/Library/ImGuiColorTextEdit path = src/Library/ImGuiColorTextEdit
url = https://github.com/BalazsJako/ImGuiColorTextEdit.git url = https://github.com/BalazsJako/ImGuiColorTextEdit.git
[submodule "src/Library/sneshacking"] [submodule "src/lib/sneshacking"]
path = src/Library/sneshacking path = src/lib/sneshacking
url = https://github.com/Skarsnik/sneshacking.git url = https://github.com/Skarsnik/sneshacking.git
[submodule "assets/asm/alttp-hacker-workspace"] [submodule "assets/asm/alttp-hacker-workspace"]
path = assets/asm/alttp-hacker-workspace path = assets/asm/alttp-hacker-workspace

10
src/CMakeLists.txt
View File

@@ -8,26 +8,26 @@ find_package(OpenGL REQUIRED)
find_package(GLEW REQUIRED) find_package(GLEW REQUIRED)
# gui libraries --------------------------------------------------------------------------------------------------- # gui libraries ---------------------------------------------------------------------------------------------------
set(IMGUI_PATH "Library/imgui") set(IMGUI_PATH "lib/imgui")
file(GLOB IMGUI_SOURCES ${IMGUI_PATH}/*.cpp) file(GLOB IMGUI_SOURCES ${IMGUI_PATH}/*.cpp)
add_library("ImGui" STATIC ${IMGUI_SOURCES}) add_library("ImGui" STATIC ${IMGUI_SOURCES})
target_include_directories("ImGui" PUBLIC ${IMGUI_PATH}) target_include_directories("ImGui" PUBLIC ${IMGUI_PATH})
target_include_directories(ImGui PUBLIC ${SDL2_INCLUDE_DIR}) target_include_directories(ImGui PUBLIC ${SDL2_INCLUDE_DIR})
target_compile_definitions(ImGui PUBLIC IMGUI_IMPL_OPENGL_LOADER_CUSTOM=<SDL2/SDL_opengl.h> GL_GLEXT_PROTOTYPES=1) target_compile_definitions(ImGui PUBLIC IMGUI_IMPL_OPENGL_LOADER_CUSTOM=<SDL2/SDL_opengl.h> 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) file(GLOB IMGUI_FILE_DLG_SOURCES ${IMGUI_FILE_DLG_PATH}/*.cpp)
add_library("ImGuiFileDialog" STATIC ${IMGUI_FILE_DLG_SOURCES}) add_library("ImGuiFileDialog" STATIC ${IMGUI_FILE_DLG_SOURCES})
target_include_directories(ImGuiFileDialog PUBLIC ${IMGUI_PATH}) target_include_directories(ImGuiFileDialog PUBLIC ${IMGUI_PATH})
target_compile_definitions(ImGuiFileDialog PUBLIC IMGUI_IMPL_OPENGL_LOADER_CUSTOM=<SDL2/SDL_opengl.h> GL_GLEXT_PROTOTYPES=1) target_compile_definitions(ImGuiFileDialog PUBLIC IMGUI_IMPL_OPENGL_LOADER_CUSTOM=<SDL2/SDL_opengl.h> 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) file(GLOB IMGUI_COLOR_TEXT_EDIT_SOURCES ${IMGUI_COLOR_TEXT_EDIT_PATH}/*.cpp)
add_library("ImGuiColorTextEdit" STATIC ${IMGUI_COLOR_TEXT_EDIT_SOURCES}) add_library("ImGuiColorTextEdit" STATIC ${IMGUI_COLOR_TEXT_EDIT_SOURCES})
target_include_directories(ImGuiColorTextEdit PUBLIC ${IMGUI_PATH}) target_include_directories(ImGuiColorTextEdit PUBLIC ${IMGUI_PATH})
target_compile_definitions(ImGuiColorTextEdit PUBLIC IMGUI_IMPL_OPENGL_LOADER_CUSTOM=<SDL2/SDL_opengl.h> GL_GLEXT_PROTOTYPES=1) target_compile_definitions(ImGuiColorTextEdit PUBLIC IMGUI_IMPL_OPENGL_LOADER_CUSTOM=<SDL2/SDL_opengl.h> GL_GLEXT_PROTOTYPES=1)
set(SNESHACKING_PATH "Library/sneshacking/src") set(SNESHACKING_PATH "lib/sneshacking/src")
file(GLOB SNESHACKING_SOURCES ${SNESHACKING_PATH}/*.c) file(GLOB SNESHACKING_SOURCES ${SNESHACKING_PATH}/*.c)
add_library("NintendoCompression" STATIC ${SNESHACKING_SOURCES}) add_library("NintendoCompression" STATIC ${SNESHACKING_SOURCES})
target_include_directories(NintendoCompression PUBLIC "/usr/local/Cellar/libpng/1.6.37/include/libpng16") target_include_directories(NintendoCompression PUBLIC "/usr/local/Cellar/libpng/1.6.37/include/libpng16")
@@ -72,7 +72,7 @@ add_executable(
target_include_directories( target_include_directories(
yaze PUBLIC yaze PUBLIC
${CMAKE_SOURCE_DIR}/src/ ${CMAKE_SOURCE_DIR}/src/
Library/ lib/
app/ app/
"C:/msys64/mingw64/include/libpng16" "C:/msys64/mingw64/include/libpng16"
"C:/msys64/mingw64/include/SDL2" "C:/msys64/mingw64/include/SDL2"

1
src/Library/ImGuiColorTextEdit

Submodule src/Library/ImGuiColorTextEdit deleted from 0a88824f7d

1
src/Library/ImGuiFileDialog

Submodule src/Library/ImGuiFileDialog deleted from 25780cf76e

1
src/Library/imgui

Submodule src/Library/imgui deleted from 9aae45eb4a

1
src/Library/sneshacking

Submodule src/Library/sneshacking deleted from 3cf5ab8681

4
test/CMakeLists.txt
View File

@@ -12,7 +12,7 @@ enable_testing()
find_package(PNG REQUIRED) find_package(PNG REQUIRED)
find_package(SDL2 REQUIRED) find_package(SDL2 REQUIRED)
set(SNESHACKING_PATH "../src/Library/sneshacking/src") set(SNESHACKING_PATH "../src/lib/sneshacking/src")
add_executable( add_executable(
yaze_test yaze_test
@@ -31,7 +31,7 @@ add_executable(
target_include_directories( target_include_directories(
yaze_test PUBLIC yaze_test PUBLIC
../src/Library/ ../src/lib/
../src/ ../src/
${SNESHACKING_PATH} ${SNESHACKING_PATH}
${SDL_INCLUDE_DIRS} ${SDL_INCLUDE_DIRS}