Add jasper to main CMakeLists.txt.

This commit is contained in:
rude
2013-09-25 23:53:36 +02:00
parent adac241660
commit 9ac8140ecc
2 changed files with 20 additions and 0 deletions
+3
View File
@@ -18,6 +18,7 @@ set(DEP_MPG123_VER "1.15.3")
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(SKIP_INSTALL_ALL TRUE)
@@ -38,6 +39,7 @@ 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)
link_directories(${SDL_LINK_DIR})
add_executable(ldeptest src/test.cpp)
@@ -55,6 +57,7 @@ target_link_libraries(ldeptest
SDL2
SDL2main
${OPENAL_LIB_NAME}
jasper-static
)
function(add_move_dll ARG_TARGET)
+17
View File
@@ -18,6 +18,16 @@
#include <AL/al.h>
#include <AL/alext.h>
#ifdef WIN32
#define JAS_WIN_MSVC_BUILD
#endif
namespace jasper
{
#include <jasper/jasper.h>
}
extern "C" {
# include "lua.h"
}
@@ -142,6 +152,12 @@ int main(int argc, char **argv)
return "OpenAL";
};
vfunc jasper = [](strs &c, strs &l)
{
c << JAS_VERSION;
l << jasper::jas_getversion();
return "jasper";
};
std::vector<vfunc> funcs;
funcs.push_back(zlib);
@@ -156,6 +172,7 @@ int main(int argc, char **argv)
funcs.push_back(freetype);
funcs.push_back(SDL2);
funcs.push_back(OpenAL);
funcs.push_back(jasper);
for (size_t i = 0; i < funcs.size(); ++i)
{