j/snake-pp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Windows no output, Fix Linux ttf undefined errors (cmake)

Browse Source 
- in windows .dll files for SDL_TTF were not copied to output due to typo
    resulted in no output at all (e.g. not even printf in main)
- in linux library is called SDL_ttf instead of SDL2_ttf
    resulted in undefined reference to `TTF_Init' etc
This commit is contained in:
jonny_jr9 2023-12-17 10:56:10 +01:00
parent a7714ec15f
commit 814cee7ba1
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CMakeLists.txt
View File

@ -17,7 +17,7 @@ if(WIN32)
set(SDL2_TTF_FOLDER "${CMAKE_SOURCE_DIR}/SDL2_ttf/") set(SDL2_TTF_FOLDER "${CMAKE_SOURCE_DIR}/SDL2_ttf/")
set(SDL2_TTF_INCLUDE_DIRS "${SDL2_TTF_FOLDER}/include") set(SDL2_TTF_INCLUDE_DIRS "${SDL2_TTF_FOLDER}/include")
set(SDL2_TTF_LIBRARIES "${SDL2_TTF_FOLDER}/lib/x64/SDL2_ttf.lib") set(SDL_TTF_LIBRARIES "${SDL2_TTF_FOLDER}/lib/x64/SDL2_ttf.lib")
set(SDL2_TTF_LIBS "${SDL2_TTF_FOLDER}/lib/x64/SDL2_ttf.lib") set(SDL2_TTF_LIBS "${SDL2_TTF_FOLDER}/lib/x64/SDL2_ttf.lib")
set(SDL2_TTF_DLLS "${SDL2_TTF_FOLDER}/lib/x64/SDL2_ttf.dll") set(SDL2_TTF_DLLS "${SDL2_TTF_FOLDER}/lib/x64/SDL2_ttf.dll")
set(SDL2_TTF_DIR "${SDL2_TTF_FOLDER}/cmake/") set(SDL2_TTF_DIR "${SDL2_TTF_FOLDER}/cmake/")
@ -30,9 +30,13 @@ endif()
# Uses SDL2_DIR on Windows, on Linux it's found automatically # Uses SDL2_DIR on Windows, on Linux it's found automatically
# Locate SDL2 # Locate SDL2
find_package(SDL2 REQUIRED) find_package(SDL2 REQUIRED)
# Locate SDL_ttf
#find_package(SDL2_ttf REQUIRED) # --- Locate SDL2_ttf ---
if(WIN32)
find_package(SDL2_ttf REQUIRED) find_package(SDL2_ttf REQUIRED)
else()
find_package(SDL_ttf REQUIRED)
endif()
#--- Include directories --- #--- Include directories ---
include_directories(${SDL2_INCLUDE_DIRS} ${SDL2_TTF_INCLUDE_DIRS} ./include ./src) include_directories(${SDL2_INCLUDE_DIRS} ${SDL2_TTF_INCLUDE_DIRS} ./include ./src)
@ -56,12 +60,12 @@ set(SOURCES
add_executable(Snake ${SOURCES}) add_executable(Snake ${SOURCES})
target_link_libraries(Snake ${SDL2_LIBRARIES} ${SDL2_TTF_LIBRARIES}) target_link_libraries(Snake ${SDL2_LIBRARIES} ${SDL_TTF_LIBRARIES})
# --- Copy SDL2 DLLs to the output folder on Windows --- # --- Copy SDL2 DLLs to the output folder on Windows ---
if(WIN32) if(WIN32)
foreach(DLL ${SDL2_DLLS} ${SDL_TTF_DLLS}) foreach(DLL ${SDL2_DLLS} ${SDL2_TTF_DLLS})
add_custom_command(TARGET Snake POST_BUILD COMMAND add_custom_command(TARGET Snake POST_BUILD COMMAND
${CMAKE_COMMAND} -E copy_if_different ${DLL} $<TARGET_FILE_DIR:Snake>) ${CMAKE_COMMAND} -E copy_if_different ${DLL} $<TARGET_FILE_DIR:Snake>)
endforeach() endforeach()