Fix cleanup script and update Conan + CMakeLists to fix errors
This commit is contained in:
parent
755f7c3b15
commit
9aacb5f136
|
|
@ -294,7 +294,7 @@ target_link_libraries(${PROJECT_NAME}
|
||||||
${PLATFORM_LIBRARIES})
|
${PLATFORM_LIBRARIES})
|
||||||
|
|
||||||
IF(APPLE)
|
IF(APPLE)
|
||||||
add_custom_command(TARGET ${target} POST_BUILD COMMAND cmake -P "${CMAKE_SOURCE_DIR}/patches/mac/CompleteBundle.cmake" VERBATIM)
|
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD COMMAND cmake -P "${CMAKE_SOURCE_DIR}/patches/mac/CompleteBundle.cmake" VERBATIM)
|
||||||
ENDIF()
|
ENDIF()
|
||||||
|
|
||||||
if(STEAM)
|
if(STEAM)
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,8 @@
|
||||||
|
|
||||||
rm -rf journal/mac/__pycache__
|
rm -rf journal/mac/__pycache__
|
||||||
rm -rf steamshim_parent/build
|
rm -rf steamshim_parent/build
|
||||||
|
rm -rf steamshim_parent/CMakeFiles
|
||||||
|
rm -rf steamshim_parent/CMakeCache.txt
|
||||||
rm -rf build
|
rm -rf build
|
||||||
rm -rf bin
|
rm -rf bin
|
||||||
rm -rf lib
|
rm -rf lib
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ class MkxpConan(ConanFile):
|
||||||
license = "GPLv2"
|
license = "GPLv2"
|
||||||
url = "https://github.com/elizagamedev/mkxp-oneshot"
|
url = "https://github.com/elizagamedev/mkxp-oneshot"
|
||||||
description = "OneShot game runtime"
|
description = "OneShot game runtime"
|
||||||
settings = "os", "compiler", "build_type", "arch"
|
settings = "os", "compiler", "build_type", "arch", "cppstd"
|
||||||
generators = "cmake"
|
generators = "cmake"
|
||||||
exports_sources = "*"
|
exports_sources = "*"
|
||||||
requires = (
|
requires = (
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue