Added libjpeg-turbo to FileHandler with a working File::ReadImageFile() function. The dependency on SOIL in libvitaboy Renderer has therefore been removed.

Also fixed formatting in recent source files.

My next task is implementing IFF chunk reading. I'll also make a tool that can convert the game's behavior.iff file to an HTML page.
This commit is contained in:
Fatbag 2012-02-27 02:55:53 -06:00
parent 83ad5d89d1
commit f23bcd7b4d
18 changed files with 816 additions and 295 deletions

View file

@ -3,6 +3,7 @@ project(FileHandler)
add_subdirectory(libexpat)
add_subdirectory(libfar)
add_subdirectory(libjpeg-turbo)
add_subdirectory(libpng)
add_subdirectory(utk)
add_subdirectory(xa)
@ -14,6 +15,7 @@ set(FILEHANDLER_MINOR 0)
set(FILEHANDLER_SOURCES
File.cpp
Image.cpp
)
include_directories(${CMAKE_SOURCE_DIR}/Libraries/FileHandler)
@ -32,4 +34,4 @@ set_target_properties(FileHandler_shared PROPERTIES
PREFIX ""
IMPORT_PREFIX ""
CLEAN_DIRECT_OUTPUT 1)
target_link_libraries(FileHandler_shared kernel32)
target_link_libraries(FileHandler_shared kernel32 jpegturbo_static)