Use jpeg-turbo library in msvc

This commit is contained in:
Benau 2017-03-21 09:17:39 +08:00
parent 3087a7c856
commit 547d28a9e4
3 changed files with 9 additions and 6 deletions

View File

@ -107,14 +107,13 @@ if((WIN32 AND NOT MINGW) OR APPLE)
add_subdirectory("${PROJECT_SOURCE_DIR}/lib/libpng")
include_directories("${PROJECT_SOURCE_DIR}/lib/libpng")
#build jpeg library
add_subdirectory("${PROJECT_SOURCE_DIR}/lib/jpeglib")
include_directories("${PROJECT_SOURCE_DIR}/lib/jpeglib")
# Add jpeg-turbo library
find_library(JPEG_LIBRARY NAMES libjpeg-62 PATHS "${PROJECT_SOURCE_DIR}/dependencies/lib")
find_path(JPEG_INCLUDE_DIRS NAMES jpeglib.h PATHS "${PROJECT_SOURCE_DIR}/dependencies/include")
set(JPEG_LIBRARIES ${JPEG_LIBRARY})
set(PNG_PNG_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lib/libpng/")
set(PNG_LIBRARY png15_static)
set(JPEG_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lib/jpeglib/")
set(JPEG_LIBRARY jpeglib)
endif()
if(NOT SERVER_ONLY AND NOT USE_GLES2)
@ -414,6 +413,10 @@ if(USE_FRIBIDI)
add_definitions(-DENABLE_BIDI)
endif()
if(MSVC)
target_link_libraries(supertuxkart ${JPEG_LIBRARIES})
endif()
# Wiiuse
# ------
if(USE_WIIUSE)

View File

@ -26,6 +26,7 @@
#include "utils/string_utils.hpp"
#include "utils/vs.hpp"
#include <jpeglib.h>
#include <cstring>
// ----------------------------------------------------------------------------

View File

@ -27,7 +27,6 @@
#include <list>
#include <pthread.h>
#include <jpeglib.h>
#define FOURCC(a,b,c,d) ((uint32_t) (((d)<<24) | ((c)<<16) | ((b)<<8) | (a)))