mirror of
https://gitlab.com/kelteseth/ScreenPlay.git
synced 2024-09-01 16:19:47 +02:00
Remove SCREENPLAY_STEAM_DEPLOY
in the end it is the same as SCREENPLAY_STEAM
This commit is contained in:
parent
00e5bb89dd
commit
0b9bd9c02c
@ -7,7 +7,6 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
|
|||||||
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
|
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
|
||||||
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
|
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
|
||||||
|
|
||||||
option(SCREENPLAY_STEAM_DEPLOY OFF "Steam build settings. Disables steam_app.txt copy step, that is only needed for development.")
|
|
||||||
option(SCREENPLAY_STEAM ON "For FOSS distribution so we do not bundle proprietary code.")
|
option(SCREENPLAY_STEAM ON "For FOSS distribution so we do not bundle proprietary code.")
|
||||||
option(TESTS_ENABLED OFF)
|
option(TESTS_ENABLED OFF)
|
||||||
|
|
||||||
@ -88,12 +87,11 @@ endif()
|
|||||||
message(STATUS "[DEFINE] SOURCE_DIR = ${SOURCE_DIR}")
|
message(STATUS "[DEFINE] SOURCE_DIR = ${SOURCE_DIR}")
|
||||||
message(STATUS "[DEFINE] BUILD_DATE = ${BUILD_DATE}")
|
message(STATUS "[DEFINE] BUILD_DATE = ${BUILD_DATE}")
|
||||||
message(STATUS "[DEFINE] GIT_COMMIT_HASH = ${GIT_COMMIT_HASH}")
|
message(STATUS "[DEFINE] GIT_COMMIT_HASH = ${GIT_COMMIT_HASH}")
|
||||||
|
message(STATUS "[OPTION] SCREENPLAY_STEAM = ${SCREENPLAY_STEAM}")
|
||||||
|
message(STATUS "[OPTION] TESTS_ENABLED = ${TESTS_ENABLED}")
|
||||||
message(STATUS "[PROJECT] CMAKE_TOOLCHAIN_FILE = ${CMAKE_TOOLCHAIN_FILE}")
|
message(STATUS "[PROJECT] CMAKE_TOOLCHAIN_FILE = ${CMAKE_TOOLCHAIN_FILE}")
|
||||||
message(STATUS "[PROJECT] VCPKG_PATH = ${VCPKG_PATH}")
|
message(STATUS "[PROJECT] VCPKG_PATH = ${VCPKG_PATH}")
|
||||||
message(STATUS "[PROJECT] VCPKG_ARCH = ${VCPKG_ARCH}")
|
message(STATUS "[PROJECT] VCPKG_ARCH = ${VCPKG_ARCH}")
|
||||||
message(STATUS "[PROJECT] CMAKE_PREFIX_PATH = ${CMAKE_PREFIX_PATH}")
|
message(STATUS "[PROJECT] CMAKE_PREFIX_PATH = ${CMAKE_PREFIX_PATH}")
|
||||||
message(STATUS "[PROJECT] VCPKG_TARGET_TRIPLET = ${VCPKG_TARGET_TRIPLET}")
|
message(STATUS "[PROJECT] VCPKG_TARGET_TRIPLET = ${VCPKG_TARGET_TRIPLET}")
|
||||||
message(STATUS "[OPTION] SCREENPLAY_STEAM_DEPLOY = ${SCREENPLAY_STEAM_DEPLOY}")
|
|
||||||
message(STATUS "[OPTION] SCREENPLAY_STEAM = ${SCREENPLAY_STEAM}")
|
|
||||||
message(STATUS "[OPTION] TESTS_ENABLED = ${TESTS_ENABLED}")
|
|
||||||
|
|
||||||
|
@ -91,7 +91,7 @@ if(APPLE)
|
|||||||
COMMENT "Copying steam library into ScreenPlay.app bundle"
|
COMMENT "Copying steam library into ScreenPlay.app bundle"
|
||||||
COMMAND ${CMAKE_COMMAND} -E copy ${steam_bin} ${workshop_install_dir})
|
COMMAND ${CMAKE_COMMAND} -E copy ${steam_bin} ${workshop_install_dir})
|
||||||
|
|
||||||
if(NOT ${SCREENPLAY_STEAM_DEPLOY})
|
if(NOT ${SCREENPLAY_STEAM})
|
||||||
add_custom_command(
|
add_custom_command(
|
||||||
TARGET workshopplugin
|
TARGET workshopplugin
|
||||||
POST_BUILD
|
POST_BUILD
|
||||||
@ -100,7 +100,7 @@ if(APPLE)
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
else()
|
else()
|
||||||
if(NOT ${SCREENPLAY_STEAM_DEPLOY})
|
if(NOT ${SCREENPLAY_STEAM})
|
||||||
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/steam_appid.txt ${CMAKE_BINARY_DIR}/bin/steam_appid.txt COPYONLY)
|
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/steam_appid.txt ${CMAKE_BINARY_DIR}/bin/steam_appid.txt COPYONLY)
|
||||||
endif()
|
endif()
|
||||||
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/qmldir ${WORKSHOP_PLUGIN_DIR}/qmldir COPYONLY)
|
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/qmldir ${WORKSHOP_PLUGIN_DIR}/qmldir COPYONLY)
|
||||||
|
@ -35,12 +35,14 @@ def run_io_tasks_in_parallel(tasks):
|
|||||||
parser = argparse.ArgumentParser(description='Build and Package ScreenPlay')
|
parser = argparse.ArgumentParser(description='Build and Package ScreenPlay')
|
||||||
parser.add_argument('-t', action="store", dest="build_type",
|
parser.add_argument('-t', action="store", dest="build_type",
|
||||||
help="Build type. This is either debug or release.")
|
help="Build type. This is either debug or release.")
|
||||||
parser.add_argument('-s', action="store", dest="sign_build",
|
parser.add_argument('-sign', action="store", dest="sign_build",
|
||||||
help="Enable if you want to sign the apps. This is macos only for now.")
|
help="Enable if you want to sign the apps. This is macos only for now.")
|
||||||
|
parser.add_argument('-steam', action="store", dest="steam_build",
|
||||||
|
help="Enable if you want to build the Steam workshop plugin.")
|
||||||
args = parser.parse_args()
|
args = parser.parse_args()
|
||||||
|
|
||||||
if not args.build_type:
|
if not args.build_type:
|
||||||
print("Build type argument is missing (release,debug). Example: python build.py -t release -s=True")
|
print("Build type argument is missing (release,debug). Example: python build.py -t release -steam=True")
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
qt_version = "5.15.2"
|
qt_version = "5.15.2"
|
||||||
@ -100,15 +102,15 @@ cmake_configure_command = """cmake ../
|
|||||||
-DCMAKE_TOOLCHAIN_FILE={toolchain}
|
-DCMAKE_TOOLCHAIN_FILE={toolchain}
|
||||||
-DVCPKG_TARGET_TRIPLET={triplet}
|
-DVCPKG_TARGET_TRIPLET={triplet}
|
||||||
-DTESTS_ENABLED=OFF
|
-DTESTS_ENABLED=OFF
|
||||||
-DSCREENPLAY_STEAM_DEPLOY=ON
|
-DSCREENPLAY_STEAM={steam}
|
||||||
-DSCREENPLAY_STEAM=ON
|
|
||||||
-G "CodeBlocks - Ninja"
|
-G "CodeBlocks - Ninja"
|
||||||
-B.
|
-B.
|
||||||
""".format(
|
""".format(
|
||||||
type=args.build_type,
|
type=args.build_type,
|
||||||
prefix_path=cmake_prefix_path,
|
prefix_path=cmake_prefix_path,
|
||||||
triplet=cmake_target_triplet,
|
triplet=cmake_target_triplet,
|
||||||
toolchain=cmake_toolchain_file).replace("\n", "")
|
toolchain=cmake_toolchain_file,
|
||||||
|
steam=args.steam_build).replace("\n", "")
|
||||||
|
|
||||||
execute(cmake_configure_command)
|
execute(cmake_configure_command)
|
||||||
execute("cmake --build . --target all")
|
execute("cmake --build . --target all")
|
||||||
|
Loading…
Reference in New Issue
Block a user