diff options
| author | Xavier Del Campo Romero <xavi.dcr@tutanota.com> | 2024-01-27 17:18:39 +0100 |
|---|---|---|
| committer | Xavier Del Campo Romero <xavi.dcr@tutanota.com> | 2024-01-27 17:38:10 +0100 |
| commit | 39ecbd690b2327db4328123f3f9a50c8492794ad (patch) | |
| tree | 123593f7bf8fe64ca4194194ac24c50384fbf176 | |
| parent | 8cd3297d05ee2301d76a6cf7fc63efd26af3885b (diff) | |
| download | jancity-39ecbd690b2327db4328123f3f9a50c8492794ad.tar.gz | |
cmake: Do not mkdir cdroot for non-PS1 builds
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | cmake/host.cmake | 2 | ||||
| -rw-r--r-- | cmake/ps1.cmake | 3 | ||||
| -rw-r--r-- | cmake/win9x.cmake | 2 |
4 files changed, 7 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 35fe3bf..e270961 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,9 +40,6 @@ if(NOT PS1_BUILD) find_package(ENET 1.3 REQUIRED) endif() -set(cdroot ${CMAKE_BINARY_DIR}/cdimg) -file(MAKE_DIRECTORY ${cdroot}) - if(PS1_BUILD) include("cmake/ps1.cmake") elseif(WIN9X_BUILD) diff --git a/cmake/host.cmake b/cmake/host.cmake index 36d7d70..8323bed 100644 --- a/cmake/host.cmake +++ b/cmake/host.cmake @@ -1,3 +1,5 @@ +set(cdroot ${CMAKE_BINARY_DIR}) + if(CMAKE_BUILD_TYPE STREQUAL "Debug") set(cflags ${cflags} -Og) else() diff --git a/cmake/ps1.cmake b/cmake/ps1.cmake index bbc1c4c..0e6ae71 100644 --- a/cmake/ps1.cmake +++ b/cmake/ps1.cmake @@ -1,5 +1,8 @@ find_package(PSXSDK 0.7.1 REQUIRED) +set(cdroot ${CMAKE_BINARY_DIR}/cdimg) +file(MAKE_DIRECTORY ${cdroot}) + target_compile_definitions(${PROJECT_NAME} PUBLIC FIXMATH_FAST_SIN PSXSDK_DEBUG) add_custom_target(exe ALL elf2exe ${PROJECT_NAME} ${cdroot}/${PROJECT_NAME}.exe -mark="A homebrew game created with PSXSDK" diff --git a/cmake/win9x.cmake b/cmake/win9x.cmake index c66ed5e..2637958 100644 --- a/cmake/win9x.cmake +++ b/cmake/win9x.cmake @@ -1,3 +1,5 @@ +set(cdroot ${CMAKE_BINARY_DIR}) + add_custom_command(OUTPUT ${cdroot}/${PROJECT_NAME}.exe COMMAND i386-mingw32-strip ${PROJECT_NAME}${CMAKE_EXECUTABLE_SUFFIX} -o ${cdroot}/${PROJECT_NAME}.exe |