Merge pull request #13 from tonytins/compile-vitaboy

Raylib-based Vitaboy demo
- Vitaboy demo now has a Raylib-based version.
- Iff2html also builds (on Windows, atm) so we can extract sprites for prototyping.

library/formats/CMakeLists.txt

@@ -15,38 +15,49 @@ add_subdirectory(utk)
 add_subdirectory(xa)
 
 set(FILEHANDLER_SOURCES
-    Audio.cpp
+    #Audio.cpp
     File.cpp
     Image.cpp
     bmp/read_bmp.c
     cst/cst.c
     utk/read_utk.c
-    wav/read_wav.c
+    #wav/read_wav.c
     xa/read_xa.c
 )
 if(WIN32)
     set(FILEHANDLER_SOURCES ${FILEHANDLER_SOURCES} resource.rc)
 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} ${LIBJPEGTURBO_INCLUDE} ${LIBPNG_INCLUDE})
+#TODO-JIP: hack, include vars are not set properly
+include_directories( "../_deps/libjpeg-turbo" )
 
-#### Static library (uncomment to build)
-#add_library(FileHandler_static STATIC ${FILEHANDLER_SOURCES})
-#set_target_properties(FileHandler_static PROPERTIES
-#    OUTPUT_NAME "FileHandler${FILEHANDLER_SERIES}"
-#    PREFIX ""
-#    CLEAN_DIRECT_OUTPUT 1)
-
-add_library(FileHandler_shared SHARED ${FILEHANDLER_SOURCES})
-if(WIN32)
-    set_target_properties(FileHandler_shared PROPERTIES OUTPUT_NAME "FileHandler${FILEHANDLER_SERIES}")
+set(FILEHANDLER_LIB)
+if(BUILD_SHARED_LIBS)
+    # BUILD_SHARED_LIBS
+    add_library(FileHandler_shared SHARED ${FILEHANDLER_SOURCES})
+    if(WIN32)
+        set_target_properties(FileHandler_shared PROPERTIES OUTPUT_NAME "FileHandler${FILEHANDLER_SERIES}")
+    else()
+        set_target_properties(FileHandler_shared PROPERTIES OUTPUT_NAME "FileHandler")
+    endif()
+    set_target_properties(FileHandler_shared PROPERTIES
+        VERSION ${FILEHANDLER_SERIES}.${FILEHANDLER_MAJOR}.${FILEHANDLER_MINOR}
+        PREFIX ""
+        IMPORT_PREFIX ""
+        CLEAN_DIRECT_OUTPUT 1)
+    
+    set(FILEHANDLER_LIB FileHandler_shared)
 else()
-    set_target_properties(FileHandler_shared PROPERTIES OUTPUT_NAME "FileHandler")
-endif()
-set_target_properties(FileHandler_shared PROPERTIES
-    VERSION ${FILEHANDLER_SERIES}.${FILEHANDLER_MAJOR}.${FILEHANDLER_MINOR}
-    PREFIX ""
-    IMPORT_PREFIX ""
-    CLEAN_DIRECT_OUTPUT 1)
+    #### Static library (uncomment to build)
+    add_library(FileHandler_static STATIC ${FILEHANDLER_SOURCES})
+    set_target_properties(FileHandler_static PROPERTIES
+        OUTPUT_NAME "FileHandler${FILEHANDLER_SERIES}"
+        PREFIX ""
+        CLEAN_DIRECT_OUTPUT 1)
 
-target_link_libraries(FileHandler_shared far_static iff_static ${LIBJPEG_LINK} ${LIBMPG123_LINK} ${LIBPNG_LINK} ${ZLIB_LINK} m)
+    target_link_libraries(FileHandler_static far_static iff_static ${LIBJPEG_LINK} ${LIBMPG123_LINK} ${LIBPNG_LINK} ${ZLIB_LINK})
+
+    set(FILEHANDLER_LIB FileHandler_static)
+endif()

library/formats/File.cpp

@@ -16,7 +16,7 @@
     OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include "FileHandler.hpp"
+#include "FileHandler.h"
 
 namespace File {
 

library/formats/Image.cpp

@@ -16,7 +16,7 @@
     OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include "FileHandler.hpp"
+#include "FileHandler.h"
 #include <jpeglib.h>
 #include <jerror.h>
 #include <png.h>
@@ -136,6 +136,7 @@ static void skip_input_data(j_decompress_ptr cinfo, long bytes)
     src->next_input_byte += bytes;
     src->bytes_in_buffer -= bytes;
 }
+
 static uint8_t * ReadJPG(Image_t * Image, const uint8_t * InData, size_t FileSize){
     //Initialize
     jpeg_decompress_struct cinfo;

library/formats/Text.cpp

@@ -1,17 +0,0 @@
-/*
-    FileHandler - General-purpose file handling library for Niotso
-    Text.cpp - Copyright (c) 2012 Niotso Project <http://niotso.org/>
-    Author(s): Fatbag <X-Fi6@phppoll.org>
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose with or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-    MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/

library/formats/far/HOWTO_EXTRACT.txt

@@ -0,0 +1,9 @@
+.\farextract.exe -tso "./Avatardata/skeletons/skeletons.dat" "./out/skeletons"
+.\farextract.exe -tso "./Avatardata/animations/animations.dat" "./out/animations"
+
+.\farextract.exe -tso "./Avatardata/bodies/meshes/meshes.dat" "./out/bodies/meshes"
+.\farextract.exe -tso "./Avatardata/bodies/textures/textures.dat" "./out/bodies/textures"
+.\farextract.exe -tso "./Avatardata/heads/meshes/meshes.dat" "./out/heads/meshes"
+.\farextract.exe -tso "./Avatardata/heads/textures/textures.dat" "./out/heads/textures"
+.\farextract.exe -tso "./Avatardata/hands/meshes/meshes.dat" "./out/hands/meshes"
+.\farextract.exe -tso "./Avatardata/hands/textures/textures.dat" "./out/hands/textures"

library/formats/far/farextract.c

@@ -20,7 +20,6 @@
 #include <string.h>
 #include <stdio.h>
 #include <stdint.h>
-#include <unistd.h>
 #include <time.h>
 #include <sys/stat.h>
 #include <errno.h>

library/formats/filehandler.h

@@ -26,7 +26,7 @@
 #include <string.h>
 
 #ifdef WIN32
-#define fhexport __declspec(dllexport);
+    #define fhexport __declspec(dllexport);
 #else
 #define fhexport __attribute__((visibility("default")));
 #endif
@@ -71,4 +71,20 @@ struct Sound_t
     uint8_t *Data;
 };
 
+namespace File {
+    inline size_t GetFileSize(FILE * hFile){
+        fseek(hFile, 0, SEEK_END);
+        size_t FileSize = ftell(hFile);
+        fseek(hFile, 0, SEEK_SET);
+        return FileSize;
+    }
+
+    extern int Error;
+    extern size_t FileSize;
+
+    uint8_t * ReadFile(const char * Filename);
+    Image_t * ReadImageFile(const char * Filename);
+    Sound_t * ReadSoundFile(const char * Filename);
+}
+
 #endif