From 648bdf19fe6d721b96f03470053a55c75d076704 Mon Sep 17 00:00:00 2001 From: bailwillharr Date: Wed, 30 Nov 2022 11:59:41 +0000 Subject: [PATCH] Move engine resources out of test --- .gitignore | 2 ++ CMakeLists.txt | 2 +- .../engine}/fonts/LiberationMono-Regular.ttf | Bin {test/res => res/engine}/shaders/font.frag | 0 {test/res => res/engine}/shaders/font.vert | 0 {test/res => res/engine}/shaders/texture.frag | 0 {test/res => res/engine}/shaders/texture.vert | 0 {test/res => res/engine}/textures/white.png | Bin test/CMakeLists.txt | 8 +++++++- test/res/textures/missing.png | Bin 125 -> 0 bytes 10 files changed, 10 insertions(+), 2 deletions(-) rename {test/res => res/engine}/fonts/LiberationMono-Regular.ttf (100%) rename {test/res => res/engine}/shaders/font.frag (100%) rename {test/res => res/engine}/shaders/font.vert (100%) rename {test/res => res/engine}/shaders/texture.frag (100%) rename {test/res => res/engine}/shaders/texture.vert (100%) rename {test/res => res/engine}/textures/white.png (100%) delete mode 100644 test/res/textures/missing.png diff --git a/.gitignore b/.gitignore index 4176078..7ab9a1a 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,5 @@ compile_commands.json runme *.log +/test/res/engine +/test/res/engine/ diff --git a/CMakeLists.txt b/CMakeLists.txt index 7a7bd61..a2ade2f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -185,4 +185,4 @@ set(ASSIMP_NO_EXPORT ON CACHE INTERNAL "" FORCE) set(ASSIMP_INSTALL OFF CACHE INTERNAL "" FORCE) add_subdirectory(dependencies/assimp) target_include_directories(${PROJECT_NAME} PRIVATE dependencies/assimp/include) -target_link_libraries(${PROJECT_NAME} PRIVATE assimp) +target_link_libraries(${PROJECT_NAME} PRIVATE assimp) \ No newline at end of file diff --git a/test/res/fonts/LiberationMono-Regular.ttf b/res/engine/fonts/LiberationMono-Regular.ttf similarity index 100% rename from test/res/fonts/LiberationMono-Regular.ttf rename to res/engine/fonts/LiberationMono-Regular.ttf diff --git a/test/res/shaders/font.frag b/res/engine/shaders/font.frag similarity index 100% rename from test/res/shaders/font.frag rename to res/engine/shaders/font.frag diff --git a/test/res/shaders/font.vert b/res/engine/shaders/font.vert similarity index 100% rename from test/res/shaders/font.vert rename to res/engine/shaders/font.vert diff --git a/test/res/shaders/texture.frag b/res/engine/shaders/texture.frag similarity index 100% rename from test/res/shaders/texture.frag rename to res/engine/shaders/texture.frag diff --git a/test/res/shaders/texture.vert b/res/engine/shaders/texture.vert similarity index 100% rename from test/res/shaders/texture.vert rename to res/engine/shaders/texture.vert diff --git a/test/res/textures/white.png b/res/engine/textures/white.png similarity index 100% rename from test/res/textures/white.png rename to res/engine/textures/white.png diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 4d2ffe2..ac33403 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -43,4 +43,10 @@ target_include_directories(${PROJECT_NAME} PRIVATE ../include) add_custom_command( TARGET ${PROJECT_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} -E create_symlink - ${PROJECT_SOURCE_DIR}/res $/res) \ No newline at end of file + ${PROJECT_SOURCE_DIR}/res $/res) + +get_target_property(ENGINE_SOURCE_DIR engine SOURCE_DIR) +add_custom_command( + TARGET ${PROJECT_NAME} POST_BUILD + COMMAND ${CMAKE_COMMAND} -E create_symlink + ${ENGINE_SOURCE_DIR}/res/engine $/res/engine) \ No newline at end of file diff --git a/test/res/textures/missing.png b/test/res/textures/missing.png deleted file mode 100644 index ec7e3b487c2b28490732263d076bb5c369b61289..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 125 zcmeAS@N?(olHy`uVBq!ia0vp^Od!kwBL7~QRScvUi-X*q7}lMWc?smOq&xaLGB9lH z=l+w(3gmMZctipf@f`+X#^d=bQh