Fix cleanup script and update Conan + CMakeLists to fix errors

This commit is contained in:
Vinyl Darkscratch 2018-10-10 18:46:10 -07:00
parent 755f7c3b15
commit 9aacb5f136
3 changed files with 4 additions and 2 deletions

View File

@ -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)

View File

@ -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

View File

@ -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 = (