JiXieShi
/
HW_Lib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SDL2 UP to SDL3

main
JiXieShi 2024-09-21 16:53:04 +08:00
parent d2e5789476
commit fbc054d999
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitmodules vendored
View File

@ -1,4 +1,3 @@
[submodule "SDL2"] [submodule "SDL3"]
path = SDL2 path = SDL3
url = https://github.com/libsdl-org/SDL.git url = https://github.com/libsdl-org/SDL.git
branch = release-2.30.x

4
CMakeLists.txt
View File

@ -26,12 +26,14 @@ endforeach ()
include_directories(easyx/include) include_directories(easyx/include)
link_directories(easyx/lib64) link_directories(easyx/lib64)
file(GLOB_RECURSE SOURCES "demo/*/*.*" "sim/*/*.*" "lvgl/src/*/*.*" "lvgl/demos/*/*.*") file(GLOB_RECURSE SOURCES "demo/*/*.*" "sim/*/*.*" "lvgl/src/*/*.*" "lvgl/demos/*/*.*")
#file(GLOB_RECURSE SOURCES "demo/tft/*.*" "sim/*/*.*" "lvgl/src/*/*.*") #file(GLOB_RECURSE SOURCES "demo/tft/*.*" "sim/*/*.*" "lvgl/src/*/*.*")
link_libraries(libeasyx.a libgdi32.a libole32.a) link_libraries(libeasyx.a libgdi32.a libole32.a)
add_executable(HW_Lib main.c ${SOURCES}) add_executable(HW_Lib main.c ${SOURCES})
add_subdirectory(SDL3 EXCLUDE_FROM_ALL)
link_libraries(SDL3::SDL3)
#导入库 #导入库
add_subdirectory(lib) add_subdirectory(lib)
target_link_libraries(HW_Lib HW_LIB_List HW_LIB_Task HW_LIB_Printf HW_LIB_Utils HW_LIB_Iic target_link_libraries(HW_Lib HW_LIB_List HW_LIB_Task HW_LIB_Printf HW_LIB_Utils HW_LIB_Iic

1
SDL2

@ -1 +0,0 @@
Subproject commit 5669b97fd78642b9068d4efa3eeab84098ce8527

1
SDL3 Submodule

@ -0,0 +1 @@
Subproject commit 89c6bc5f5022e71433a9e4eb1a2edc6d79be71f2