From 2a01850a8e362beed0febb496f3c9e16bc46df0a Mon Sep 17 00:00:00 2001 From: rjindael Date: Fri, 21 Jul 2023 00:38:12 -0700 Subject: [PATCH 1/3] Enable console on Debug builds --- Projects/Client/Player/CMakeLists.txt | 14 ++++++++------ Projects/Client/Studio/CMakeLists.txt | 14 ++++++++------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/Projects/Client/Player/CMakeLists.txt b/Projects/Client/Player/CMakeLists.txt index 2639461..677ad66 100644 --- a/Projects/Client/Player/CMakeLists.txt +++ b/Projects/Client/Player/CMakeLists.txt @@ -21,9 +21,11 @@ qt_add_executable(Player ${SOURCE} ${HEADER}) target_include_directories(Player PRIVATE Header) target_link_libraries(Player PRIVATE Common Engine) -set_target_properties(Player PROPERTIES - OUTPUT_NAME "RNR.Player" - - WIN32_EXECUTABLE ON - MACOSX_BUNDLE ON -) \ No newline at end of file +set_target_properties(Player PROPERTIES OUTPUT_NAME "RNR.Player") + +if(NOT CMAKE_BUILD_TYPE STREQUAL "DEBUG") + set_target_properties(Player PROPERTIES + WIN32_EXECUTABLE ON + MACOSX_BUNDLE ON + ) +endif() \ No newline at end of file diff --git a/Projects/Client/Studio/CMakeLists.txt b/Projects/Client/Studio/CMakeLists.txt index 7ca8ff9..9223c7d 100644 --- a/Projects/Client/Studio/CMakeLists.txt +++ b/Projects/Client/Studio/CMakeLists.txt @@ -23,9 +23,11 @@ qt_add_executable(Studio ${SOURCE} ${HEADER}) target_include_directories(Studio PRIVATE Header) target_link_libraries(Studio PRIVATE Common Engine) -set_target_properties(Studio PROPERTIES - OUTPUT_NAME "RNR.Studio" - - WIN32_EXECUTABLE ON - MACOSX_BUNDLE ON -) \ No newline at end of file +set_target_properties(Studio PROPERTIES OUTPUT_NAME "RNR.Studio") + +if(NOT CMAKE_BUILD_TYPE STREQUAL "DEBUG") + set_target_properties(Studio PROPERTIES + WIN32_EXECUTABLE ON + MACOSX_BUNDLE ON + ) +endif() \ No newline at end of file From 9cd93ac7c9150d51110c7cac6fb1f1b8e6cd927d Mon Sep 17 00:00:00 2001 From: rjindael Date: Fri, 21 Jul 2023 00:41:53 -0700 Subject: [PATCH 2/3] account for build type case sensitivity --- Projects/Client/Player/CMakeLists.txt | 2 +- Projects/Client/Studio/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Projects/Client/Player/CMakeLists.txt b/Projects/Client/Player/CMakeLists.txt index 677ad66..ada3a06 100644 --- a/Projects/Client/Player/CMakeLists.txt +++ b/Projects/Client/Player/CMakeLists.txt @@ -23,7 +23,7 @@ target_link_libraries(Player PRIVATE Common Engine) set_target_properties(Player PROPERTIES OUTPUT_NAME "RNR.Player") -if(NOT CMAKE_BUILD_TYPE STREQUAL "DEBUG") +if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug") set_target_properties(Player PROPERTIES WIN32_EXECUTABLE ON MACOSX_BUNDLE ON diff --git a/Projects/Client/Studio/CMakeLists.txt b/Projects/Client/Studio/CMakeLists.txt index 9223c7d..9d1fb2c 100644 --- a/Projects/Client/Studio/CMakeLists.txt +++ b/Projects/Client/Studio/CMakeLists.txt @@ -25,7 +25,7 @@ target_link_libraries(Studio PRIVATE Common Engine) set_target_properties(Studio PROPERTIES OUTPUT_NAME "RNR.Studio") -if(NOT CMAKE_BUILD_TYPE STREQUAL "DEBUG") +if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug") set_target_properties(Studio PROPERTIES WIN32_EXECUTABLE ON MACOSX_BUNDLE ON From b6d2d19c67494c2f53c945a97ff606a6f7eea0fb Mon Sep 17 00:00:00 2001 From: rjindael Date: Fri, 21 Jul 2023 01:25:14 -0700 Subject: [PATCH 3/3] Update Luau to upstream --- Dependencies/Luau | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dependencies/Luau b/Dependencies/Luau index e25de95..2181591 160000 --- a/Dependencies/Luau +++ b/Dependencies/Luau @@ -1 +1 @@ -Subproject commit e25de95445f2d635a125ab463426bb7fda017093 +Subproject commit 218159140c7d79ae745e646da721d12331f536f5