Merge branch 'particle_cleanup' of github:BMagnu/fs2open.github.com i…

…nto particle_cleanup

CMakeLists.txt

@@ -122,11 +122,24 @@ option(FSO_RELEASE_LOGGING "Enable logging output for release builds" OFF)
 
 OPTION(FSO_BUILD_WITH_FFMPEG "Enable the usage of FFmpeg for sound and custscenes" ON)
 
+OPTION(FSO_BUILD_WITH_DISCORD "Build with Discord support" ON)
+
 OPTION(FSO_BUILD_WITH_OPENGL "Enable compilation of the OpenGL renderer" ON)
 OPTION(FSO_BUILD_WITH_OPENGL_DEBUG "Enables debug option for OpenGL" OFF)
 
 OPTION(FSO_BUILD_WITH_VULKAN "Enable compilation of the Vulkan renderer" OFF)
 
+IF(NOT APPLE)
+	SET(OPENXR_BUILD_DEFAULT ON)
+ELSE()
+	SET(OPENXR_BUILD_DEFAULT OFF)
+ENDIF()
+OPTION(FSO_BUILD_WITH_OPENXR "Build with OpenXR support" ${OPENXR_BUILD_DEFAULT})
+IF(FSO_BUILD_WITH_OPENXR AND APPLE)
+	MESSAGE(WARNING "FSO_BUILD_WITH_OPENXR is ON. Not supported on macOS - setting to OFF.")
+	SET(FSO_BUILD_WITH_OPENXR OFF CACHE BOOL "" FORCE)
+ENDIF()
+
 OPTION(FSO_BUILD_WITH_OPENXR_DEBUG "Enables debug option for OpenXR" OFF)
 
 OPTION(FSO_USE_LTO "Build using LTO (only for release builds)" ON)
@@ -141,9 +154,11 @@ mark_as_advanced(FORCE FSO_INSTALL_DEBUG_FILES)
 mark_as_advanced(FORCE ENABLE_COTIRE)
 mark_as_advanced(FORCE FSO_RELEASE_LOGGING)
 mark_as_advanced(FORCE FSO_BUILD_WITH_FFMPEG)
+mark_as_advanced(FORCE FSO_BUILD_WITH_DISCORD)
 mark_as_advanced(FORCE FSO_BUILD_WITH_OPENGL)
 mark_as_advanced(FORCE FSO_BUILD_WITH_OPENGL_DEBUG)
 mark_as_advanced(FORCE FSO_BUILD_WITH_VULKAN)
+mark_as_advanced(FORCE FSO_BUILD_WITH_OPENXR)
 mark_as_advanced(FORCE FSO_BUILD_WITH_OPENXR_DEBUG)
 
 # Include cotire file from https://github.com/sakra/cotire/
@@ -231,5 +246,7 @@ message(STATUS "Building qtFRED: ${FSO_BUILD_QTFRED}")
 message(STATUS "Fatal warnings: ${FSO_FATAL_WARNINGS}")
 message(STATUS "Release logging: ${FSO_RELEASE_LOGGING}")
 message(STATUS "With FFmpeg: ${FSO_BUILD_WITH_FFMPEG}")
+message(STATUS "With Discord: ${FSO_BUILD_WITH_DISCORD}")
 message(STATUS "With OpenGL: ${FSO_BUILD_WITH_OPENGL}")
 message(STATUS "With Vulkan: ${FSO_BUILD_WITH_VULKAN}")
+message(STATUS "With OpenXR: ${FSO_BUILD_WITH_OPENXR}")

code/CMakeLists.txt

@@ -25,7 +25,11 @@ if (FSO_BUILD_WITH_OPENGL)
 	endif()
 endif()
 
-if(FSO_BUILD_WITH_OPENXR_DEBUG)
+if(FSO_BUILD_WITH_OPENXR)
+	add_definitions(-DFS_OPENXR)
+endif()
+
+if(FSO_BUILD_WITH_OPENXR_DEBUG AND FSO_BUILD_WITH_OPENXR)
 	add_definitions(-DFS_OPENXR_DEBUG)
 endif()
 
@@ -48,7 +52,10 @@ TARGET_LINK_LIBRARIES(code PUBLIC compiler)
 
 target_link_libraries(code PUBLIC md5)
 
-target_link_libraries(code PUBLIC discord-rpc)
+if (FSO_BUILD_WITH_DISCORD)
+	target_link_libraries(code PUBLIC discord-rpc)
+	add_definitions(-DWITH_DISCORD)
+endif()
 
 target_link_libraries(code PUBLIC libRocket)
 
@@ -79,7 +86,7 @@ target_link_libraries(code PUBLIC hidapi::hidapi)
 
 target_link_libraries(code PUBLIC imgui)
 
-IF(NOT APPLE)
+IF(FSO_BUILD_WITH_OPENXR)
 	target_link_libraries(code PUBLIC OpenXR::openxr_loader)
 	target_include_directories(code PUBLIC OpenXR::Headers)
 ENDIF()
@@ -139,4 +146,4 @@ set_target_properties(code PROPERTIES XCODE_ATTRIBUTE_STRIP_INSTALLED_PRODUCT[va
 set_target_properties(code PROPERTIES XCODE_ATTRIBUTE_GCC_SYMBOLS_PRIVATE_EXTERN[variant=Debug] "NO")
 
 # Prevent GCC warnings in third-party BitOp... see GitHub #4366
-suppress_file_warnings(scripting/lua/bitop/bit.c)
+suppress_file_warnings(scripting/lua/bitop/bit.c)