simtactics/mysimulation
1
0
Fork 0
mirror of https://github.com/simtactics/mysimulation.git synced 2025-04-30 08:21:47 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

temp hack to get jpeg turbo going

Browse source
This commit is contained in:
Jip 2024-05-03 02:40:50 +02:00
parent b99359078e
commit 7189dfbd9c
4 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
library/CMakeLists.txt
View file

@ -11,7 +11,7 @@ if(BUILD_SHARED_LIBS)
endif() endif()
if(WIN32) if(WIN32)
set(64BIT 0) set(64BIT 1)
else() else()
set(64BIT 1) set(64BIT 1)
endif() endif()
@ -104,21 +104,21 @@ if(WIN32)
set(ZLIB_INCLUDE ${CMAKE_SOURCE_DIR}/_deps/zlib) set(ZLIB_INCLUDE ${CMAKE_SOURCE_DIR}/_deps/zlib)
add_subdirectory(_deps/freetype) add_subdirectory(_deps/freetype)
#add_subdirectory(_deps/libjpeg-turbo) add_subdirectory(_deps/libjpeg-turbo)
#add_subdirectory(_deps/libmpg123) #add_subdirectory(_deps/libmpg123)
add_subdirectory(_deps/libpng) add_subdirectory(_deps/libpng)
#add_subdirectory(_deps/libpq) #add_subdirectory(_deps/libpq)
add_subdirectory(_deps/zlib) add_subdirectory(_deps/zlib)
set(FREETYPE_LINK freetype_shared) set(FREETYPE_LINK freetype_shared)
#set(LIBJPEG_LINK jpegturbo_static) set(LIBJPEG_LINK jpegturbo_static)
#set(LIBMPG123_LINK libmpg123_static) #set(LIBMPG123_LINK libmpg123_static)
set(LIBPNG_LINK libpng_static) set(LIBPNG_LINK libpng_static)
#set(LIBPQ_LINK libpq_shared) #set(LIBPQ_LINK libpq_shared)
set(ZLIB_LINK zlib_static) set(ZLIB_LINK zlib_static)
else() else()
set(FREETYPE_LINK freetype) set(FREETYPE_LINK freetype)
#set(LIBJPEG_LINK jpeg) set(LIBJPEG_LINK jpeg)
#set(LIBMPG123_LINK mpg123) #set(LIBMPG123_LINK mpg123)
set(LIBPNG_LINK png) set(LIBPNG_LINK png)
#set(LIBPQ_LINK pq) #set(LIBPQ_LINK pq)

9
library/formats/CMakeLists.txt
View file

@ -29,10 +29,13 @@ if(WIN32)
endif() endif()
#include_directories(${FILEHANDLER_INCLUDE} ${LIBMPG123_INCLUDE} ${LIBJPEGTURBO_INCLUDE} ${LIBPNG_INCLUDE}) #include_directories(${FILEHANDLER_INCLUDE} ${LIBMPG123_INCLUDE} ${LIBJPEGTURBO_INCLUDE} ${LIBPNG_INCLUDE})
include_directories(${FILEHANDLER_INCLUDE} ${LIBPNG_INCLUDE}) include_directories(${FILEHANDLER_INCLUDE} ${LIBJPEGTURBO_INCLUDE} ${LIBPNG_INCLUDE})
#TODO-JIP: hack, include vars are not set properly
include_directories( "../_deps/libjpeg-turbo" )
set(FILEHANDLER_LIB) set(FILEHANDLER_LIB)
if(BUILD_SHARED_LIBS) if(BUILD_SHARED_LIBS)
# BUILD_SHARED_LIBS
add_library(FileHandler_shared SHARED ${FILEHANDLER_SOURCES}) add_library(FileHandler_shared SHARED ${FILEHANDLER_SOURCES})
if(WIN32) if(WIN32)
set_target_properties(FileHandler_shared PROPERTIES OUTPUT_NAME "FileHandler${FILEHANDLER_SERIES}") set_target_properties(FileHandler_shared PROPERTIES OUTPUT_NAME "FileHandler${FILEHANDLER_SERIES}")
@ -57,6 +60,4 @@ else()
target_link_libraries(FileHandler_static far_static iff_static ${LIBJPEG_LINK} ${LIBMPG123_LINK} ${LIBPNG_LINK} ${ZLIB_LINK}) target_link_libraries(FileHandler_static far_static iff_static ${LIBJPEG_LINK} ${LIBMPG123_LINK} ${LIBPNG_LINK} ${ZLIB_LINK})
set(FILEHANDLER_LIB FileHandler_static) set(FILEHANDLER_LIB FileHandler_static)
endif() # BUILD_SHARED_LIBS endif()
target_link_libraries(${FILEHANDLER_LIB} far_static iff_static ${LIBJPEG_LINK} ${LIBMPG123_LINK} ${LIBPNG_LINK} ${ZLIB_LINK})

9
library/formats/Image.cpp
View file

@ -17,8 +17,8 @@
*/ */
#include "FileHandler.h" #include "FileHandler.h"
//#include <jpeglib.h> #include <jpeglib.h>
//#include <jerror.h> #include <jerror.h>
#include <png.h> #include <png.h>
#include <setjmp.h> //Used for libpng #include <setjmp.h> //Used for libpng
#include "bmp/read_bmp.h" #include "bmp/read_bmp.h"
@ -120,7 +120,6 @@ static uint8_t * ReadBMP(Image_t * Image, const uint8_t * InData, size_t FileSiz
// libjpeg-turbo v6 doesn't support jpeg_mem_src, so we have to implement it here // libjpeg-turbo v6 doesn't support jpeg_mem_src, so we have to implement it here
/*
static void term_source(j_decompress_ptr){} static void term_source(j_decompress_ptr){}
static int fill_mem_input_buffer(j_decompress_ptr cinfo){ static int fill_mem_input_buffer(j_decompress_ptr cinfo){
ERREXIT(cinfo, JERR_FILE_READ); ERREXIT(cinfo, JERR_FILE_READ);
@ -137,10 +136,8 @@ static void skip_input_data(j_decompress_ptr cinfo, long bytes)
src->next_input_byte += bytes; src->next_input_byte += bytes;
src->bytes_in_buffer -= bytes; src->bytes_in_buffer -= bytes;
} }
*/
static uint8_t * ReadJPG(Image_t * Image, const uint8_t * InData, size_t FileSize){ static uint8_t * ReadJPG(Image_t * Image, const uint8_t * InData, size_t FileSize){
/*
//Initialize //Initialize
jpeg_decompress_struct cinfo; jpeg_decompress_struct cinfo;
jpeg_error_mgr jerr; jpeg_error_mgr jerr;
@ -201,8 +198,6 @@ static uint8_t * ReadJPG(Image_t * Image, const uint8_t * InData, size_t FileSiz
Image->Data = OutData; Image->Data = OutData;
} }
return OutData; return OutData;
*/
return NULL;
} }
struct pngdata_t { struct pngdata_t {

6
library/formats/filehandler.h
View file

@ -82,9 +82,9 @@ namespace File {
extern int Error; extern int Error;
extern size_t FileSize; extern size_t FileSize;
fhexport uint8_t * ReadFile(const char * Filename); uint8_t * ReadFile(const char * Filename);
fhexport Image_t * ReadImageFile(const char * Filename); Image_t * ReadImageFile(const char * Filename);
fhexport Sound_t * ReadSoundFile(const char * Filename); Sound_t * ReadSoundFile(const char * Filename);
} }
#endif #endif