Browse Source

Add upng, remove SDL_image.

Godzil 3 years ago
parent
commit
1995aa3799
5 changed files with 18 additions and 4 deletions
  1. 3 0
      .gitmodules
  2. 1 0
      CMakeLists.txt
  3. 10 0
      external/cmake/Buildupng.cmake
  4. 1 0
      external/upng
  5. 3 4
      source/CMakeLists.txt

+ 3 - 0
.gitmodules

@@ -0,0 +1,3 @@
+[submodule "external/upng"]
+	path = external/upng
+	url = https://github.com/elanthis/upng

+ 1 - 0
CMakeLists.txt

@@ -5,6 +5,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/external/cmake ${CMAKE_MODULE_
 
 project("ThreeDEngine")
 
+include(Buildupng)
 include(GetGitRevisionDescription)
 git_describe(VERSION --tags --dirty=-dirty)
 

+ 10 - 0
external/cmake/Buildupng.cmake

@@ -0,0 +1,10 @@
+cmake_minimum_required(VERSION 3.1)
+include(ExternalProject)
+
+add_library(uPNG STATIC)
+target_include_directories(uPNG PUBLIC external/upng)
+
+set(UPNG_SOURCES external/upng/upng.c)
+set(UPNG_HEADERS external/upng/upng.h)
+
+target_sources(uPNG PRIVATE ${UPNG_SOURCES} ${UPNG_HEADERS})

+ 1 - 0
external/upng

@@ -0,0 +1 @@
+Subproject commit 01937b7d1c0a4491d49511cbb227163911476867

+ 3 - 4
source/CMakeLists.txt

@@ -1,11 +1,10 @@
 cmake_minimum_required(VERSION 3.1)
 
 find_package(SDL2 REQUIRED)
-find_package(SDL2_image REQUIRED)
 find_package(SDL2_ttf REQUIRED)
 
-set(SDL2_LIBS ${SDL2_LIBRARIES} ${SDL2IMAGE_LIBRARY} ${SDL2_TTF_LIBRARY})
-set(SDL2_INCDIR ${SDL2_INCLUDE_DIR} ${SDL2_IMAGE_INCLUDE_DIR})
+set(SDL2_LIBS ${SDL2_LIBRARIES} ${SDL2_TTF_LIBRARY})
+set(SDL2_INCDIR ${SDL2_INCLUDE_DIR} ${SDL2_TTF_INCLUDE_DIR})
 
 file(GLOB_RECURSE TDE_SOURCES *.c)
 file(GLOB_RECURSE TDE_HEADERS include/*.h)
@@ -14,4 +13,4 @@ add_executable(3dengine)
 target_include_directories(3dengine PUBLIC include/)
 target_sources(3dengine PRIVATE ${TDE_SOURCES} ${TDE_HEADERS})
 target_include_directories(3dengine PUBLIC ${SDL2_INCDIR})
-target_link_libraries(3dengine ${SDL2_LIBS})
+target_link_libraries(3dengine ${SDL2_LIBS} uPNG)