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

move yaze_py target to the cli directory

Browse Source
This commit is contained in:
scawful
2024-11-15 23:39:26 -05:00
parent b336d14233
commit f7dd9622c9
6 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/CMakeLists.txt
View File

@@ -44,7 +44,7 @@ if (YAZE_BUILD_Z3ED)
include(cli/z3ed.cmake) include(cli/z3ed.cmake)
endif() endif()
if (YAZE_BUILD_PYTHON) if (YAZE_BUILD_PYTHON)
include(py/yaze_py.cmake) include(cli/python/yaze_py.cmake)
endif() endif()
if (YAZE_BUILD_TESTS) if (YAZE_BUILD_TESTS)
include(test/CMakeLists.txt) include(test/CMakeLists.txt)
@@ -53,13 +53,13 @@ endif()
if(MACOS) if(MACOS)
set(MACOSX_BUNDLE_ICON_FILE ${CMAKE_SOURCE_DIR}/win32/yaze.ico) set(MACOSX_BUNDLE_ICON_FILE ${CMAKE_SOURCE_DIR}/win32/yaze.ico)
set_target_properties(yaze set_target_properties(yaze
PROPERTIES PROPERTIES
BUNDLE True BUNDLE True
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin" RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/cmake/yaze.plist.in MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/cmake/yaze.plist.in
RESOURCE ${YAZE_RESOURCE_FILES} RESOURCE ${YAZE_RESOURCE_FILES}
) )
elseif(UNIX) elseif(UNIX)
set_target_properties(yaze set_target_properties(yaze
@@ -72,13 +72,13 @@ elseif(UNIX)
target_compile_definitions(yaze PRIVATE "linux") target_compile_definitions(yaze PRIVATE "linux")
target_compile_definitions(yaze PRIVATE "stricmp=strcasecmp") target_compile_definitions(yaze PRIVATE "stricmp=strcasecmp")
else() else()
set_target_properties(yaze set_target_properties(yaze
PROPERTIES PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin" RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
LINK_FLAGS "${CMAKE_CURRENT_SOURCE_DIR}/win32/yaze.res" LINK_FLAGS "${CMAKE_CURRENT_SOURCE_DIR}/win32/yaze.res"
) )
endif() endif()
# Yaze C API # Yaze C API
@@ -101,6 +101,7 @@ if (YAZE_BUILD_LIB)
yaze_c PUBLIC yaze_c PUBLIC
lib/ lib/
app/ app/
${CMAKE_SOURCE_DIR}/incl/
${CMAKE_SOURCE_DIR}/src/ ${CMAKE_SOURCE_DIR}/src/
${PNG_INCLUDE_DIRS} ${PNG_INCLUDE_DIRS}
${SDL2_INCLUDE_DIR} ${SDL2_INCLUDE_DIR}

0
src/py/yaze_py.cc → src/cli/python/yaze_py.cc
View File

0
src/py/yaze_py.cmake → src/cli/python/yaze_py.cmake
View File

1
src/cli/z3ed.cmake
View File

@@ -22,6 +22,7 @@ target_include_directories(
lib/ lib/
app/ app/
${ASAR_INCLUDE_DIR} ${ASAR_INCLUDE_DIR}
${CMAKE_SOURCE_DIR}/incl/
${CMAKE_SOURCE_DIR}/src/ ${CMAKE_SOURCE_DIR}/src/
${PNG_INCLUDE_DIRS} ${PNG_INCLUDE_DIRS}
${SDL2_INCLUDE_DIR} ${SDL2_INCLUDE_DIR}

1
src/test/CMakeLists.txt
View File

@@ -27,6 +27,7 @@ target_include_directories(
yaze_test PUBLIC yaze_test PUBLIC
app/ app/
lib/ lib/
${CMAKE_SOURCE_DIR}/incl/
${CMAKE_SOURCE_DIR}/src/ ${CMAKE_SOURCE_DIR}/src/
${CMAKE_SOURCE_DIR}/src/lib/imgui_test_engine ${CMAKE_SOURCE_DIR}/src/lib/imgui_test_engine
${ASAR_INCLUDE_DIR} ${ASAR_INCLUDE_DIR}

2
src/test/integration/test_editor.cc
View File

@@ -48,7 +48,7 @@ int RunIntegrationTest() {
yaze::app::core::Controller controller; yaze::app::core::Controller controller;
controller.init_test_editor(&test_editor); controller.init_test_editor(&test_editor);
if (!controller.CreateSDL_Window().ok()) { if (!controller.CreateWindow().ok()) {
return EXIT_FAILURE; return EXIT_FAILURE;
} }
if (!controller.CreateRenderer().ok()) { if (!controller.CreateRenderer().ok()) {