diff --git a/CMakeLists.txt b/CMakeLists.txt index 2274a104c..9601c83ba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,14 +10,14 @@ option(BUILD_DARWIN "MacOS" OFF) # Backends set(TARGET_ARCH "" CACHE STRING "Target architecture [AMD64,ARM64,UNIVERSAL]") set_property(CACHE TARGET_ARCH PROPERTY STRINGS AMD64 ARM64 UNIVERSAL) -option(USE_SDL "Enable SDL" OFF) -option(USE_OPENGL "Enable OpenGL" OFF) -option(USE_LOADGL "Enable SDL w/OpenGL Support" OFF) -option(USE_PTHREAD "Enable Multi-Threading" OFF) -option(USE_WEBM "Enable WebM" OFF) -option(USE_VORBIS "Enable Vorbis" OFF) +option(USE_SDL "Enable SDL" ON) +option(USE_OPENGL "Enable OpenGL" ON) +option(USE_LOADGL "Enable SDL w/OpenGL Support" ON) +option(USE_PTHREAD "Enable Multi-Threading" ON) +option(USE_WEBM "Enable WebM" ON) +option(USE_VORBIS "Enable Vorbis" ON) option(USE_TREMOR "Enable Tremor" OFF) -option(USE_GFX "Enable Video Scaling" OFF) +option(USE_GFX "Enable Video Scaling" ON) # Linker Options option(ENABLE_STATIC "Enable Static Linking" OFF) diff --git a/cmake/linux.cmake b/cmake/linux.cmake index 11c9e435d..1be598751 100644 --- a/cmake/linux.cmake +++ b/cmake/linux.cmake @@ -1,24 +1,10 @@ set(COMMON_COMPILER_FLAGS "${COMMON_COMPILER_FLAGS} -Wno-stringop-truncation -Wno-maybe-uninitialized -Wno-unused-result -Wno-void-pointer-to-enum-cast -Wno-deprecated-declarations") set(ARCH_SUFFIX "") -set(USE_SDL ON) -set(USE_OPENGL ON) -set(USE_LOADGL ON) -set(USE_GFX ON) -set(USE_VORBIS ON) -set(USE_WEBM ON) -set(USE_PTHREAD ON) - -set(ENABLE_STATIC ON) - if(NOT CMAKE_PREFIX_PATH) set(CMAKE_PREFIX_PATH "/usr") endif() -if(NOT CMAKE_LIBRARY_PATH) - set(CMAKE_LIBRARY_PATH "${CMAKE_PREFIX_PATH}/lib") -endif() - if(TARGET_ARCH STREQUAL "arm64") set(ARCH_SUFFIX "-arm64") endif() @@ -28,9 +14,6 @@ if(NOT TARGET_ARCH MATCHES "${CMAKE_SYSTEM_PROCESSOR}") if(NOT CMAKE_C_COMPILER) set(CMAKE_C_COMPILER "aarch64-linux-gnu-gcc-12") endif() - if(NOT CMAKE_LIBRARY_PATH) - set(CMAKE_LIBRARY_PATH "${CMAKE_PREFIX_PATH}/usr/lib/aarch64-linux-gnu") - endif() endif() endif() @@ -41,12 +24,11 @@ target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_PREFIX_PATH}/include/SDL2 ) -string(REPLACE " " ";" library_paths ${CMAKE_LIBRARY_PATH}) -foreach(lib_path ${library_paths}) - target_link_libraries(${PROJECT_NAME} PRIVATE - -L${lib_path} +if(CMAKE_LIBRARY_PATH) + target_link_directories(${PROJECT_NAME} PRIVATE + ${CMAKE_LIBRARY_PATH} ) -endforeach() +endif() # Distribution Preperation add_custom_command(TARGET ${PROJECT_NAME}