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

@ -7,8 +7,14 @@ set(LIBVITABOY_MINOR 1)
set(LIBVITABOY_SOURCES
anim.cpp
apr.cpp
bnd.cpp
col.cpp
hag.cpp
libvitaboy.cpp
mesh.cpp
oft.cpp
po.cpp
skel.cpp
)
if(WIN32)
@ -33,7 +39,7 @@ set_target_properties(libvitaboy_shared PROPERTIES
CLEAN_DIRECT_OUTPUT 1)
add_executable(vbparse vbparse.cpp)
target_link_libraries(vbparse libvitaboy_static)
target_link_libraries(vbparse libvitaboy_static FileHandler_shared)
add_executable(Renderer Renderer.cpp)
target_link_libraries(Renderer libvitaboy_shared "${CMAKE_SOURCE_DIR}/Libraries/libvitaboy/libSOIL.a" FileHandler_shared opengl32 glu32 winmm)
target_link_libraries(Renderer libvitaboy_shared FileHandler_shared opengl32 glu32 winmm)