LOVE/megasource
1
0
Fork 0
mirror of https://github.com/love2d/megasource.git synced 2026-08-12 00:20:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add tiff to main CMakeLists.txt.

Browse Source
This commit is contained in:
rude
2013-09-26 00:18:28 +02:00
parent 8229da494b
commit 6e493fb605
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+4 -1
View File
@@ -19,6 +19,7 @@ set(DEP_FREETYPE_VER "2.5.0.1")
set(DEP_SDL2_VER "2.0.0")
set(DEP_OPENAL_VER "1.15.1")
set(DEP_JASPER_VER "1.900.1")
set(DEP_TIFF_VER "4.0.3")
set(SKIP_INSTALL_ALL TRUE)
@@ -39,7 +40,8 @@ add_subdirectory("libs/mpg123-${DEP_MPG123_VER}" ${CMAKE_BINARY_DIR}/mpg123)
add_subdirectory("libs/freetype-${DEP_FREETYPE_VER}" ${CMAKE_BINARY_DIR}/freetype)
add_subdirectory("libs/SDL2-${DEP_SDL2_VER}" ${CMAKE_BINARY_DIR}/SDL2)
add_subdirectory("libs/openal-soft-${DEP_OPENAL_VER}" ${CMAKE_BINARY_DIR}/openal-soft)
add_subdirectory("libs/JASPER-${DEP_JASPER_VER}" ${CMAKE_BINARY_DIR}/JASPER)
add_subdirectory("libs/jasper-${DEP_JASPER_VER}" ${CMAKE_BINARY_DIR}/jasper)
add_subdirectory("libs/tiff-${DEP_TIFF_VER}" ${CMAKE_BINARY_DIR}/tiff)
link_directories(${SDL_LINK_DIR})
add_executable(ldeptest src/test.cpp)
@@ -58,6 +60,7 @@ target_link_libraries(ldeptest
SDL2main
${OPENAL_LIB_NAME}
jasper-static
tiff-static
)
function(add_move_dll ARG_TARGET)
src/test.cpp
+11
View File
@@ -17,6 +17,8 @@
#include <SDL.h>
#include <AL/al.h>
#include <AL/alext.h>
#include <tiff.h>
#include <tiffio.h>
#ifdef WIN32
#define JAS_WIN_MSVC_BUILD
@@ -159,6 +161,14 @@ int main(int argc, char **argv)
return "jasper";
};
vfunc tiff = [](strs &c, strs &l)
{
const char *unused = TIFFGetVersion(); // Output is too ugly.
c << TIFF_VERSION_BIG;
l << "N/A";
return "tiff";
};
std::vector<vfunc> funcs;
funcs.push_back(zlib);
funcs.push_back(physfs);
@@ -173,6 +183,7 @@ int main(int argc, char **argv)
funcs.push_back(SDL2);
funcs.push_back(OpenAL);
funcs.push_back(jasper);
funcs.push_back(tiff);
for (size_t i = 0; i < funcs.size(); ++i)
{