Skip to content

Port Window.c and crt.c from SDL2 to SDL3 #137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Grosama wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Port Window.c and crt.c from SDL2 to SDL3 #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.6)
cmake_minimum_required(VERSION 4.1.2)

project(Tilengine)

Expand All @@ -18,12 +18,11 @@ elseif (UNIX AND APPLE)
target_link_libraries(${PROJECT_NAME} PRIVATE "framework")
endif()

target_link_libraries(${PROJECT_NAME} PRIVATE "c")
target_link_libraries(${PROJECT_NAME} PRIVATE "z")
target_link_libraries(${PROJECT_NAME} PRIVATE "png")
find_package(SDL3 REQUIRED CONFIG REQUIRED COMPONENTS SDL3)
target_link_libraries(${PROJECT_NAME} PRIVATE SDL3::SDL3)

find_package(SDL2 REQUIRED)
target_link_libraries(${PROJECT_NAME} PRIVATE ${SDL2_LIBRARIES})
find_package(PNG REQUIRED)
target_link_libraries(${PROJECT_NAME} PRIVATE PNG::PNG)

target_include_directories(${PROJECT_NAME} PRIVATE include)

Expand All @@ -37,9 +36,6 @@ file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/include/Tilengine.h
add_executable(Test src/Test.c)
target_include_directories(Test PRIVATE include)
target_link_libraries(Test PRIVATE "Tilengine")
target_link_libraries(Test PRIVATE "c")
target_link_libraries(Test PRIVATE "z")
target_link_libraries(Test PRIVATE "png")
target_link_libraries(Test PRIVATE "m")

# samples
Expand Down
12 changes: 6 additions & 6 deletions samples/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.6)
cmake_minimum_required(VERSION 4.1.2)

project(samples)

Expand All @@ -11,12 +11,12 @@ endif()

include_directories(../include)
link_libraries("Tilengine")
link_libraries("c")
link_libraries("z")
link_libraries("png")
link_libraries("m")
find_package(SDL2 REQUIRED)
link_libraries(${SDL2_LIBRARIES})
find_package(SDL3 REQUIRED CONFIG COMPONENTS SDL3)
find_package(PNG REQUIRED)
link_libraries(SDL3::SDL3)
link_libraries(PNG::PNG)


set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -O2 -fpic -DLIB_EXPORTS")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-result -Wno-format-truncation")
Expand Down
Loading