gitea/SDL3_fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove SDL3_main from build systems, remove most of src/main/*

Browse Source 
XCode is still missing, and src/main/winrt/SDL3-WinRTResource*
still need to find a new home
This commit is contained in:
Daniel Gibson
2022-12-12 23:27:42 +01:00
committed by Sam Lantinga
parent 63d3fb469d
commit c3bf253b09
19 changed files with 12 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
cmake/test/CMakeLists.txt
View File

@@ -29,13 +29,7 @@ add_feature_info("TEST_STATIC" TEST_STATIC "Test linking with static library")
if(TEST_SHARED)
find_package(SDL3 REQUIRED CONFIG COMPONENTS SDL3)
if(EMSCRIPTEN OR (WIN32 AND NOT WINDOWS_STORE))
find_package(SDL3 REQUIRED CONFIG COMPONENTS SDL3_main)
endif()
add_executable(gui-shared WIN32 main_gui.c)
if(TARGET SDL3::SDL3_main)
target_link_libraries(gui-shared PRIVATE SDL3::SDL3_main)
endif()
target_link_libraries(gui-shared PRIVATE SDL3::SDL3)
if(WIN32)
add_custom_command(TARGET gui-shared POST_BUILD
@@ -61,13 +55,9 @@ if(TEST_SHARED)
)
endif()
# SDL3_LIBRARIES does not support creating a cli SDL3 application
# (it is possible that SDL3_main is a stub, but we don't know for sure)
if(NOT TARGET SDL3::SDL3_main)
add_executable(cli-shared-vars main_cli.c)
target_link_libraries(cli-shared-vars PRIVATE ${SDL3_LIBRARIES})
target_include_directories(cli-shared-vars PRIVATE ${SDL3_INCLUDE_DIRS})
endif()
add_executable(cli-shared-vars main_cli.c)
target_link_libraries(cli-shared-vars PRIVATE ${SDL3_LIBRARIES})
target_include_directories(cli-shared-vars PRIVATE ${SDL3_INCLUDE_DIRS})
add_library(sharedlib-shared-vars SHARED main_lib.c)
target_link_libraries(sharedlib-shared-vars PRIVATE ${SDL3_LIBRARIES})
@@ -79,13 +69,7 @@ endif()
if(TEST_STATIC)
find_package(SDL3 REQUIRED CONFIG COMPONENTS SDL3-static)
if(EMSCRIPTEN OR (WIN32 AND NOT WINDOWS_STORE))
find_package(SDL3 REQUIRED CONFIG COMPONENTS SDL3_main)
endif()
add_executable(gui-static WIN32 main_gui.c)
if(TARGET SDL3::SDL3_main)
target_link_libraries(gui-static PRIVATE SDL3::SDL3_main)
endif()
target_link_libraries(gui-static PRIVATE SDL3::SDL3-static)
option(SDL_STATIC_PIC "SDL static library has been built with PIC")
@@ -98,19 +82,16 @@ if(TEST_STATIC)
endif()
add_executable(gui-static-vars WIN32 main_gui.c)
target_link_libraries(gui-static-vars PRIVATE ${SDL3MAIN_LIBRARY} ${SDL3_STATIC_LIBRARIES})
target_link_libraries(gui-static-vars PRIVATE ${SDL3_STATIC_LIBRARIES})
target_include_directories(gui-static-vars PRIVATE ${SDL3_INCLUDE_DIRS})
add_executable(cli-static main_cli.c)
target_link_libraries(cli-static PRIVATE SDL3::SDL3-static)
# SDL3_LIBRARIES does not support creating a cli SDL3 application (when SDL3::SDL3_main is available)
# (it is possible that SDL3_main is a stub, but we don't know for sure)
if(NOT TARGET SDL3::SDL3_main)
add_executable(cli-static-vars main_cli.c)
target_link_libraries(cli-static-vars PRIVATE ${SDL3_STATIC_LIBRARIES})
target_include_directories(cli-static-vars PRIVATE ${SDL3_INCLUDE_DIRS})
endif()
add_executable(cli-static-vars main_cli.c)
target_link_libraries(cli-static-vars PRIVATE ${SDL3_STATIC_LIBRARIES})
target_include_directories(cli-static-vars PRIVATE ${SDL3_INCLUDE_DIRS})
endif()
message(STATUS "SDL3_PREFIX: ${SDL3_PREFIX}")
@@ -118,7 +99,6 @@ message(STATUS "SDL3_INCLUDE_DIR: ${SDL3_INCLUDE_DIR}")
message(STATUS "SDL3_INCLUDE_DIRS: ${SDL3_INCLUDE_DIRS}")
message(STATUS "SDL3_LIBRARIES: ${SDL3_LIBRARIES}")
message(STATUS "SDL3_STATIC_LIBRARIES: ${SDL3_STATIC_LIBRARIES}")
message(STATUS "SDL3MAIN_LIBRARY: ${SDL3MAIN_LIBRARY}")
message(STATUS "SDL3TEST_LIBRARY: ${SDL3TEST_LIBRARY}")
feature_summary(WHAT ALL)

1
cmake/test/jni/Android.mk
View File

@@ -7,5 +7,4 @@ LOCAL_SRC_FILES := ../main_gui.c
LOCAL_SHARED_LIBRARIES += SDL3
include $(BUILD_SHARED_LIBRARY)
$(call import-module,SDL3_main)
$(call import-module,SDL3)