shift non-torque config flags over to lib/cmakelists.txt

Engine/lib/CMakeLists.txt

@@ -4,6 +4,9 @@
 #SDL
 set(SDL_SHARED ON CACHE BOOL "Build a shared version of the library" FORCE)
 set(SDL_STATIC OFF CACHE BOOL "Build a static version of the library" FORCE)
+mark_as_advanced(SDL2MAIN_LIBRARY)
+mark_as_advanced(SDL2_CORE_LIBRARY)
+mark_as_advanced(SDL2_INCLUDE_DIR)
 mark_as_advanced(SDL2_DISABLE_INSTALL)
 mark_as_advanced(SDL2_DISABLE_SDL2MAIN)
 mark_as_advanced(SDL2_DISABLE_UNINSTALL)
@@ -173,6 +176,73 @@ add_subdirectory(collada ${CMAKE_BINARY_DIR}/temp/collada EXCLUDE_FROM_ALL)
 add_subdirectory(glad ${CMAKE_BINARY_DIR}/temp/glad EXCLUDE_FROM_ALL)
 
 #if(TORQUE_SFX_OPENAL AND NOT TORQUE_DEDICATED)
+if(APPLE)
+    advanced_option(AL_ALEXT_PROTOTYPES "Use Extended OpenAL options" OFF)
+else()
+    advanced_option(AL_ALEXT_PROTOTYPES "Use Extended OpenAL options" ON)
+endif(APPLE)
+
+if(AL_ALEXT_PROTOTYPES)
+	addDef( "AL_ALEXT_PROTOTYPES" )
+endif()
+
+#hidden options
+if(TORQUE_SFX_OPENAL)
+    advanced_option(TORQUE_OGGVORBIS "Enable OGG Vorbis" ON)
+    advanced_option(ALSOFT_EAX "Enable legacy EAX extensions" ${WIN32})
+    advanced_option(ALSOFT_INSTALL_EXAMPLES "Install example programs (alplay, alstream, ...)" ON)
+    advanced_option(ALSOFT_INSTALL_UTILS "Install utility programs (openal-info, alsoft-config, ...)" ON)
+    advanced_option(ALSOFT_UPDATE_BUILD_VERSION "Update git build version info" ON)
+    mark_as_advanced(ALSOFT_REQUIRE_OBOE)
+    mark_as_advanced(ALSOFT_REQUIRE_PIPEWIRE)
+    mark_as_advanced(ALSOFT_REQUIRE_RTKIT)
+    mark_as_advanced(ALSOFT_REQUIRE_SSE3)
+    #Hide some unnecessary fields as advanced
+    mark_as_advanced(ALSOFT_INSTALL_AMBDEC_PRESETS)
+    mark_as_advanced(ALSOFT_BACKEND_DSOUND)
+    mark_as_advanced(ALSOFT_BACKEND_MMDEVAPI)
+    mark_as_advanced(ALSOFT_BACKEND_WAVE)
+    mark_as_advanced(ALSOFT_BACKEND_WINMM)
+    mark_as_advanced(ALSOFT_INSTALL_CONFIG)
+    mark_as_advanced(ALSOFT_CPUEXT_SSE)
+    mark_as_advanced(ALSOFT_CPUEXT_SSE2)
+    mark_as_advanced(ALSOFT_CPUEXT_SSE3)
+    mark_as_advanced(ALSOFT_CPUEXT_SSE4_1)
+    mark_as_advanced(ALSOFT_DLOPEN)
+    mark_as_advanced(ALSOFT_EMBED_HRTF_DATA)
+    mark_as_advanced(ALSOFT_EXAMPLES)
+    mark_as_advanced(ALSOFT_INSTALL_HRTF_DATA)
+    mark_as_advanced(ALSOFT_INSTALL)
+    mark_as_advanced(ALSOFT_NO_CONFIG_UTIL)
+    mark_as_advanced(ALSOFT_NO_UID_DEFS)
+    mark_as_advanced(ALSOFT_REQUIRE_ALSA)
+    mark_as_advanced(ALSOFT_REQUIRE_COREAUDIO)
+    mark_as_advanced(ALSOFT_REQUIRE_DSOUND)
+    mark_as_advanced(ALSOFT_REQUIRE_JACK)
+    mark_as_advanced(ALSOFT_REQUIRE_MMDEVAPI)
+    mark_as_advanced(ALSOFT_REQUIRE_NEON)
+    mark_as_advanced(ALSOFT_REQUIRE_OPENSL)
+    mark_as_advanced(ALSOFT_REQUIRE_OSS)
+    mark_as_advanced(ALSOFT_REQUIRE_PORTAUDIO)
+    mark_as_advanced(ALSOFT_REQUIRE_PULSEAUDIO)
+    mark_as_advanced(ALSOFT_REQUIRE_QSA)
+    mark_as_advanced(ALSOFT_REQUIRE_SNDIO)
+    mark_as_advanced(ALSOFT_REQUIRE_SOLARIS)
+    mark_as_advanced(ALSOFT_REQUIRE_SSE)
+    mark_as_advanced(ALSOFT_REQUIRE_SSE2)
+    mark_as_advanced(ALSOFT_REQUIRE_SSE4_1)
+    mark_as_advanced(ALSOFT_REQUIRE_WINMM)
+    mark_as_advanced(ALSOFT_TESTS)
+    mark_as_advanced(ALSOFT_UTILS)
+    mark_as_advanced(ALSOFT_WERROR)
+    mark_as_advanced(COREAUDIO_FRAMEWORK)
+    mark_as_advanced(CMAKE_DEBUG_POSTFIX)
+    mark_as_advanced(FORCE_STATIC_VCRT)
+    mark_as_advanced(ALSOFT_BACKEND_WASAPI)
+    mark_as_advanced(ALSOFT_BUILD_ROUTER)
+    mark_as_advanced(ALSOFT_REQUIRE_SDL2)
+    mark_as_advanced(ALSOFT_REQUIRE_WASAPI)
+endif()
     add_subdirectory(libvorbis ${CMAKE_BINARY_DIR}/temp/libvorbis EXCLUDE_FROM_ALL)
     add_subdirectory(libogg ${CMAKE_BINARY_DIR}/temp/libogg EXCLUDE_FROM_ALL)
     add_subdirectory(libtheora ${CMAKE_BINARY_DIR}/temp/libtheora EXCLUDE_FROM_ALL)

Tools/CMake/torque_configs.cmake

@@ -64,75 +64,3 @@ advanced_option(TORQUE_ENABLE_PROFILER "Enable or disable the profiler" OFF)
 advanced_option(TORQUE_SHOW_LEGACY_FILE_FIELDS "If on, shows legacy direct file path fields in the inspector." OFF)
 
 setupVersionNumbers()
-
-if(APPLE)
-    advanced_option(AL_ALEXT_PROTOTYPES "Use Extended OpenAL options" OFF)
-else()
-    advanced_option(AL_ALEXT_PROTOTYPES "Use Extended OpenAL options" ON)
-endif(APPLE)
-
-if(AL_ALEXT_PROTOTYPES)
-	addDef( "AL_ALEXT_PROTOTYPES" )
-endif()
-
-#hidden options
-if(TORQUE_SFX_OPENAL)
-    advanced_option(TORQUE_OGGVORBIS "Enable OGG Vorbis" ON)
-    advanced_option(ALSOFT_EAX "Enable legacy EAX extensions" ${WIN32})
-    advanced_option(ALSOFT_INSTALL_EXAMPLES "Install example programs (alplay, alstream, ...)" ON)
-    advanced_option(ALSOFT_INSTALL_UTILS "Install utility programs (openal-info, alsoft-config, ...)" ON)
-    advanced_option(ALSOFT_UPDATE_BUILD_VERSION "Update git build version info" ON)
-    mark_as_advanced(ALSOFT_REQUIRE_OBOE)
-    mark_as_advanced(ALSOFT_REQUIRE_PIPEWIRE)
-    mark_as_advanced(ALSOFT_REQUIRE_RTKIT)
-    mark_as_advanced(ALSOFT_REQUIRE_SSE3)
-    #Hide some unnecessary fields as advanced
-    mark_as_advanced(ALSOFT_INSTALL_AMBDEC_PRESETS)
-    mark_as_advanced(ALSOFT_BACKEND_DSOUND)
-    mark_as_advanced(ALSOFT_BACKEND_MMDEVAPI)
-    mark_as_advanced(ALSOFT_BACKEND_WAVE)
-    mark_as_advanced(ALSOFT_BACKEND_WINMM)
-    mark_as_advanced(ALSOFT_INSTALL_CONFIG)
-    mark_as_advanced(ALSOFT_CPUEXT_SSE)
-    mark_as_advanced(ALSOFT_CPUEXT_SSE2)
-    mark_as_advanced(ALSOFT_CPUEXT_SSE3)
-    mark_as_advanced(ALSOFT_CPUEXT_SSE4_1)
-    mark_as_advanced(ALSOFT_DLOPEN)
-    mark_as_advanced(ALSOFT_EMBED_HRTF_DATA)
-    mark_as_advanced(ALSOFT_EXAMPLES)
-    mark_as_advanced(ALSOFT_INSTALL_HRTF_DATA)
-    mark_as_advanced(ALSOFT_INSTALL)
-    mark_as_advanced(ALSOFT_NO_CONFIG_UTIL)
-    mark_as_advanced(ALSOFT_NO_UID_DEFS)
-    mark_as_advanced(ALSOFT_REQUIRE_ALSA)
-    mark_as_advanced(ALSOFT_REQUIRE_COREAUDIO)
-    mark_as_advanced(ALSOFT_REQUIRE_DSOUND)
-    mark_as_advanced(ALSOFT_REQUIRE_JACK)
-    mark_as_advanced(ALSOFT_REQUIRE_MMDEVAPI)
-    mark_as_advanced(ALSOFT_REQUIRE_NEON)
-    mark_as_advanced(ALSOFT_REQUIRE_OPENSL)
-    mark_as_advanced(ALSOFT_REQUIRE_OSS)
-    mark_as_advanced(ALSOFT_REQUIRE_PORTAUDIO)
-    mark_as_advanced(ALSOFT_REQUIRE_PULSEAUDIO)
-    mark_as_advanced(ALSOFT_REQUIRE_QSA)
-    mark_as_advanced(ALSOFT_REQUIRE_SNDIO)
-    mark_as_advanced(ALSOFT_REQUIRE_SOLARIS)
-    mark_as_advanced(ALSOFT_REQUIRE_SSE)
-    mark_as_advanced(ALSOFT_REQUIRE_SSE2)
-    mark_as_advanced(ALSOFT_REQUIRE_SSE4_1)
-    mark_as_advanced(ALSOFT_REQUIRE_WINMM)
-    mark_as_advanced(ALSOFT_TESTS)
-    mark_as_advanced(ALSOFT_UTILS)
-    mark_as_advanced(ALSOFT_WERROR)
-    mark_as_advanced(COREAUDIO_FRAMEWORK)
-    mark_as_advanced(CMAKE_DEBUG_POSTFIX)
-    mark_as_advanced(FORCE_STATIC_VCRT)
-    mark_as_advanced(ALSOFT_BACKEND_WASAPI)
-    mark_as_advanced(ALSOFT_BUILD_ROUTER)
-    mark_as_advanced(ALSOFT_REQUIRE_SDL2)
-    mark_as_advanced(ALSOFT_REQUIRE_WASAPI)
-    #the following is from openal-soft
-    mark_as_advanced(SDL2MAIN_LIBRARY)
-    mark_as_advanced(SDL2_CORE_LIBRARY)
-    mark_as_advanced(SDL2_INCLUDE_DIR)    
-endif()