fixes some warnings and crazy gcc link issue

QGearsMain/CMakeLists.txt

@@ -1,7 +1,7 @@
 # define header and source files for the library
 set(HEADER_FILES
   include/modules/worldmap/WorldMapModule.h
-  include/common/QGearsApplication.h
+
   include/common/QGearsManualObject.h
   include/common/QGearsResource.h
   include/common/QGearsStringUtil.h
@@ -99,9 +99,11 @@ set(HEADER_FILES
   include/core/XmlTextFile.h
   include/core/XmlTextsFile.h
   #include/viewer/ViewerModule.h
+  include/data/QGearsXMLSerializer.h
 )
 
 set(HEADER_FILES_DATA
+  include/common/QGearsApplication.h
 include/data/worldmap/MapFile.h
   include/data/worldmap/MapFileManager.h
   include/data/worldmap/MapFileSerializer.h
@@ -146,10 +148,10 @@ include/data/worldmap/MapFile.h
   include/data/QGearsSerializer.h
   include/data/QGearsTexCodec.h
   include/data/QGearsTexFile.h
-  include/data/QGearsXMLSerializer.h
 )
 
 set(SOURCE_FILES_DATA
+  src/common/QGearsApplication.cpp
   src/data/QGearsAFile.cpp
   src/data/QGearsAFileManager.cpp
   src/data/QGearsAFileSerializer.cpp
@@ -194,12 +196,12 @@ set(SOURCE_FILES_DATA
   src/data/QGearsSerializer.cpp
   src/data/QGearsTexCodec.cpp
   src/data/QGearsTexFile.cpp
-  src/data/QGearsXMLSerializer.cpp
+
 )
 
 set(SOURCE_FILES
   src/modules/worldmap/WorldMapModule.cpp
-  src/common/QGearsApplication.cpp
+
   src/common/QGearsManualObject.cpp
   src/common/QGearsResource.cpp
   src/common/QGearsStringUtil.cpp
@@ -276,6 +278,7 @@ set(SOURCE_FILES
   src/map/QGearsWalkmeshFileXMLSerializer.cpp
   #src/viewer/ViewerModule.cpp
   src/QGearsGameState.cpp
+  src/data/QGearsXMLSerializer.cpp
 )
 if(QGears_SOUND)
     set(HEADER_FILES

QGearsMain/src/common/FileSystem.cpp

@@ -37,8 +37,13 @@ FileSystem::ReadFile(const Ogre::String &path, void* buffer, const unsigned int
     }
 
     fseek(file, start, SEEK_SET);
-    fread(buffer, sizeof(char), length, file);
+    const auto ret = fread(buffer, sizeof(char), length, file);
     fclose(file);
+    if (ret != sizeof(char))
+    {
+        LOG_ERROR("Failed to read all data\n");
+        return false;
+    }
 
     return true;
 }

utilities/CMakeLists.txt

@@ -40,8 +40,6 @@ add_library(Utility STATIC
 )
 
 target_link_libraries(Utility
-    QGearsMain
-	q-gears-data
     ${OGRE_LIBRARIES}
     ${OIS_LIBRARIES}
     ${ZLIB_LIBRARIES}

utilities/ffix_model_exporter/CMakeLists.txt

@@ -39,6 +39,8 @@ endif()
 
 set(LIBRARIES
     Utility
+    QGearsMain
+    q-gears-data
 )
 target_link_libraries(ff9_model_exporter    ${LIBRARIES})
 

utilities/ffix_script_dumper/CMakeLists.txt

@@ -33,6 +33,8 @@ endif()
 
 set(LIBRARIES
     Utility
+    QGearsMain
+    q-gears-data
 )
 target_link_libraries(ff9_script_dumper    ${LIBRARIES})
 

utilities/ffix_sound_dumper/CMakeLists.txt

@@ -43,6 +43,8 @@ endif()
 
 set(LIBRARIES
     Utility
+    QGearsMain
+    q-gears-data
 )
 target_link_libraries(ff9_sound_dumper    ${LIBRARIES})
 

utilities/ffvii_battle_model_exporter/CMakeLists.txt

@@ -47,6 +47,8 @@ endif()
 
 set(LIBRARIES
     Utility
+    QGearsMain
+    q-gears-data
 )
 target_link_libraries(ff7_battle_model_exporter    ${LIBRARIES})
 

utilities/ffvii_battle_scene_dumper/CMakeLists.txt

@@ -39,6 +39,8 @@ endif()
 
 set(LIBRARIES
     Utility
+    QGearsMain
+    q-gears-data
 )
 target_link_libraries(ff7_battle_scene_dumper    ${LIBRARIES})
 

utilities/ffvii_field_dat_dumper/CMakeLists.txt

@@ -36,6 +36,8 @@ endif()
 
 set(LIBRARIES
     Utility
+    QGearsMain
+    q-gears-data
 )
 target_link_libraries(ff7_field_dat_dumper    ${LIBRARIES})
 

utilities/ffvii_field_model_exporter/CMakeLists.txt

@@ -50,6 +50,8 @@ endif()
 
 set(LIBRARIES
     Utility
+    QGearsMain
+    q-gears-data
 )
 target_link_libraries(ff7_field_model_exporter    ${LIBRARIES})
 

utilities/ffvii_field_model_exporter_pc/CMakeLists.txt

@@ -11,13 +11,13 @@ set(SOURCE_FILES
     src/main.cpp
 )
 
-add_definitions(
-    -DQGEARS_ADD_MANAGERS
-)
+#add_definitions(
+#    -DQGEARS_ADD_MANAGERS
+#)
 
 add_executable(ff7_field_model_exporter_pc
-  ${HEADER_FILES}
   ${SOURCE_FILES}
+  ${HEADER_FILES}
 )
 SET_PROPERTY(TARGET ff7_field_model_exporter_pc PROPERTY FOLDER "utilities")
 
@@ -33,8 +33,16 @@ if(WIN32)
 endif()
 
 set(LIBRARIES
-	q-gears-data
-    Utility
+    q-gears-data
+
+    QGearsMain
+
+
+    ${OGRE_LIBRARIES}
+    ${OIS_LIBRARIES}
+    ${ZLIB_LIBRARIES}
+Utility
+
 )
 target_link_libraries(ff7_field_model_exporter_pc    ${LIBRARIES})
 

utilities/ffvii_font_exporter/CMakeLists.txt

@@ -31,7 +31,9 @@ endif()
 
 set(LIBRARIES
     Utility
-	${ZLIB_LIBRARIES}
+    QGearsMain
+    q-gears-data
+    ${ZLIB_LIBRARIES}
 )
 target_link_libraries(ff7_font_exporter    ${LIBRARIES})
 

utilities/ffvii_sound_dumper/CMakeLists.txt

@@ -41,6 +41,8 @@ endif()
 
 set(LIBRARIES
     Utility
+    QGearsMain
+    q-gears-data
 )
 target_link_libraries(ff7_sound_dumper    ${LIBRARIES})
 

utilities/ffvii_sound_dumper_psf/CMakeLists.txt

@@ -71,6 +71,8 @@ endif()
 
 set(LIBRARIES
     Utility
+    QGearsMain
+    q-gears-data
 )
 target_link_libraries(ff7_sound_dumper_psf    ${LIBRARIES})
 

utilities/flevel/CMakeLists.txt

@@ -29,6 +29,8 @@ endif()
 
 set(LIBRARIES
     Utility
+    QGearsMain
+    q-gears-data
 )
 target_link_libraries(flevel    ${LIBRARIES})
 

utilities/lzs/CMakeLists.txt

@@ -29,6 +29,8 @@ endif()
 
 set(LIBRARIES
     Utility
+    QGearsMain
+    q-gears-data
 )
 target_link_libraries(lzs    ${LIBRARIES})
 

utilities/q-gears-launcher/CMakeLists.txt

@@ -49,6 +49,8 @@ endif()
 
 set(LIBRARIES
     Utility
+    QGearsMain
+    q-gears-data
 )
 
 
@@ -58,4 +60,4 @@ if(WIN32 OR APPLE)
   install(TARGETS q-gears-launcher DESTINATION . ) 
 else()
   install(TARGETS q-gears-launcher RUNTIME DESTINATION bin ) 
-endif()
+endif()

utilities/xeno_cd_extract/extract.cpp

@@ -29,8 +29,8 @@ void parse_file(unsigned long start_sector, unsigned long file_size, int id, cha
 
     unsigned char arfile[2352];
     unsigned char type[4];
-    char* extention;
-    unsigned long file_type;
+    const char* extention;
+    unsigned int file_type;
 
     char number[10];
 
@@ -170,7 +170,7 @@ void parse_file(unsigned long start_sector, unsigned long file_size, int id, cha
 
     FILE* desc_file = fopen("description.txt", "a+");
     char desc[ 255 ];
-    sprintf(desc, "%s - 0x%04x, 0x%04x\n", file_name, start_sector, file_size);
+    sprintf(desc, "%s - 0x%04x, 0x%04x\n", file_name, static_cast<unsigned int>(start_sector), static_cast<unsigned int>(file_size));
     fputs (desc, desc_file);
     fclose(desc_file);
 
@@ -308,12 +308,12 @@ void extract(char *filename)
             //mkdir(filename);
             abort();
 
-            printf("number of file %d, in dir %d", -file_size, directory_number);
+            printf("number of file %d, in dir %d", static_cast<int>(-file_size), directory_number);
         }
         // file
         if (start_sector != 0 && file_size < 0xff000000 && file_size > 0)
         {
-            printf("file number %d, size: 0x%x byte - ", i, file_size);
+            printf("file number %d, size: 0x%x byte - ", i, static_cast<unsigned int>(file_size));
             parse_file(start_sector, file_size, i, filename);
         }
     }

utilities/xeno_model_exporter/CMakeLists.txt

@@ -46,6 +46,8 @@ endif()
 
 set(LIBRARIES
     Utility
+    QGearsMain
+    q-gears-data
 )
 target_link_libraries(xeno_model_exporter    ${LIBRARIES})
 

utilities/xeno_script_dumper/CMakeLists.txt

@@ -64,6 +64,8 @@ endif()
 
 set(LIBRARIES
     Utility
+    QGearsMain
+    q-gears-data
 )
 target_link_libraries(xeno_script_dumper    ${LIBRARIES})
 

utilities/xeno_script_dumper/src/common/filesystem/driver/RealFileDriver.cpp

@@ -50,8 +50,13 @@ RealFileDriver::ReadFile(const RString &path, void* buffer, const unsigned int s
     }
 
     fseek(file, start, SEEK_SET);
-    fread(buffer, sizeof(char), length, file);
+    const auto ret = fread(buffer, sizeof(char), length, file);
     fclose(file);
+    if (ret != sizeof(char))
+    {
+        LOGGER->Log("Expected to read %d but got %d bytes\n", sizeof(char), ret);
+        return false;
+    }
 
     return true;
 }

utilities/xeno_sound_dumper/CMakeLists.txt

@@ -41,6 +41,8 @@ endif()
 
 set(LIBRARIES
     Utility
+    QGearsMain
+    q-gears-data
 )
 target_link_libraries(xeno_sound_dumper    ${LIBRARIES})
 

utilities/xeno_walkmesh_exporter/CMakeLists.txt

@@ -98,6 +98,8 @@ endif()
 
 set(LIBRARIES
     Utility
+    QGearsMain
+    q-gears-data
 )
 target_link_libraries(xeno_walkmesh_exporter    ${LIBRARIES})
 

utilities/xeno_walkmesh_exporter/src/common/display/surface/SurfaceLoadBmp.cpp

@@ -141,7 +141,13 @@ SurfaceUtils::LoadBMP(const std::string &file, Surface* &img)
     fseek(image, 0, SEEK_SET);
 
     buffer = (unsigned char*)malloc(sizeof(unsigned char) * size);
-    fread(buffer, 1, size, image);
+    const auto readRet = fread(buffer, 1, size, image);
+    if (readRet != sizeof(char))
+    {
+        LOGGER->Log(LOGGER_ERROR, "fread failure");
+        fclose(image);
+        return OPEN_FATAL_ERROR;
+    }
 
     SurfaceUtils::OpenResult ret;
 
@@ -151,8 +157,9 @@ SurfaceUtils::LoadBMP(const std::string &file, Surface* &img)
     if (ret != SurfaceUtils::OPEN_OK && img != NULL)
     {
         delete img;
-        img = NULL;
+        img = NULL;;
     }
 
+    fclose(image);
     return ret;
 }

utilities/xeno_walkmesh_exporter/src/common/filesystem/driver/RealFileDriver.cpp

@@ -50,8 +50,13 @@ RealFileDriver::ReadFile(const RString &path, void* buffer, const unsigned int s
     }
 
     fseek(file, start, SEEK_SET);
-    fread(buffer, sizeof(char), length, file);
+    const auto ret = fread(buffer, sizeof(char), length, file);
     fclose(file);
+    if (ret != sizeof(char))
+    {
+        LOGGER->Log(LOGGER_ERROR, "fread failure");
+        return false;
+    }
 
     return true;
 }