A bit of cleanup in CMakeLists after removing SUDM.

CMakeLists.txt

@@ -14,11 +14,11 @@ set(VGears_VERSION__MINOR 1)
 set(VGears_VERSION__PATCH 0)
 
 if ("${CMAKE_BUILD_TYPE}" STREQUAL "")
-  # CMake defaults to leaving CMAKE_BUILD_TYPE empty. This screws up
-  # differentiation between debug and release builds.
-  set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build, options are: None (CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel." FORCE)
-  message("CMAKE_BUILD_TYPE was empty defaulting to Release")
-endif ()
+    # CMake defaults to leaving CMAKE_BUILD_TYPE empty. This screws up
+    # differentiation between debug and release builds.
+    set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build, options are: None (CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel." FORCE)
+    message("CMAKE_BUILD_TYPE was empty defaulting to Release")
+endif()
 
 message("CMAKE_BUILD_TYPE is ${CMAKE_BUILD_TYPE} CMAKE_BINARY_DIR is ${CMAKE_BINARY_DIR}")
 
@@ -30,43 +30,44 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/bin_debug)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/bin_debug)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/bin_debug)
 
-# Generate header containing window title/version information
+# Generate header containing window title/version information.
 set(VGEARS_VERSION "V-Gears v${VGears_VERSION__MAJOR}.${VGears_VERSION__MINOR}.${VGears_VERSION__PATCH}")
 configure_file(configure_version_file.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/configure_version_file.cmake @ONLY)
 
 add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/vgears_version.h
-  COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/configure_version_file.cmake
-  DEPENDS
-    ${CMAKE_CURRENT_BINARY_DIR}/configure_version_file.cmake
-    ${CMAKE_CURRENT_SOURCE_DIR}/V-Gears/include/vgears_version.h.in
-  COMMENT "Configuring vgears_version.h"
-  VERBATIM)
+    COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/configure_version_file.cmake
+    DEPENDS
+        ${CMAKE_CURRENT_BINARY_DIR}/configure_version_file.cmake
+        ${CMAKE_CURRENT_SOURCE_DIR}/V-Gears/include/vgears_version.h.in
+    COMMENT "Configuring vgears_version.h"
+    VERBATIM
+)
 add_custom_target(configure_vgears_version ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/vgears_version.h)
 
-# Enable Visual Studio solution "folders"
-SET_PROPERTY(GLOBAL PROPERTY USE_FOLDERS ON) 
+# Enable Visual Studio solution "folders".
+SET_PROPERTY(GLOBAL PROPERTY USE_FOLDERS ON)
 
 #if (APPLE)
-#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
-#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32")
-#set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -m32")
+    #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
+    #set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32")
+    #set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -m32")
 #endif()
 
 set(CMAKE_FRAMEWORK_PATH
-      ${CMAKE_FRAMEWORK_PATH}
-      ${CMAKE_CURRENT_SOURCE_DIR}/OgreSDK/lib/macosx/Release
-      ${CMAKE_CURRENT_SOURCE_DIR}/OgreSDK/lib/macosx/Debug
-   )
+    ${CMAKE_FRAMEWORK_PATH}
+    ${CMAKE_CURRENT_SOURCE_DIR}/OgreSDK/lib/macosx/Release
+    ${CMAKE_CURRENT_SOURCE_DIR}/OgreSDK/lib/macosx/Debug
+)
 
 set(OGRE_FRAMEWORK_INCLUDES
-      ${CMAKE_CURRENT_SOURCE_DIR}/OgreSDK/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/OgreSDK/include
 )
 
-option(VGears_BUILD_PLUGINS     "Build the plugins"     TRUE)
-option(VGears_BUILD_UTILITIES   "Build the V-Gears-Installer"   TRUE)
-option(VGears_BUILD_TESTS       "Build the unit tests"  FALSE)
-option(VGears_MULTITHREADING    "Enable multithreading" FALSE)
-option(VGears_SOUND             "Enable Sound"          TRUE)
+option(VGears_BUILD_PLUGINS "Build the plugins" TRUE)
+option(VGears_BUILD_UTILITIES "Build the V-Gears-Installer" TRUE)
+option(VGears_BUILD_TESTS "Build the unit tests" FALSE)
+option(VGears_MULTITHREADING "Enable multithreading" FALSE)
+option(VGears_SOUND "Enable Sound" TRUE)
 
 find_path(OGRE_CMAKE_MODULE_PATH FindOGRE.cmake
     HINTS
@@ -89,16 +90,16 @@ message("VGears_SOURCE_DIR ${VGears_SOURCE_DIR}")
 
 set(CMAKE_MODULE_PATH "${OGRE_CMAKE_MODULE_PATH};${CMAKE_MODULE_PATH}")
 set(CMAKE_MODULE_PATH 
-  "${CMAKE_MODULE_PATH}"
-  "${CMAKE_SOURCE_DIR}/CMake"
+    "${CMAKE_MODULE_PATH}"
+    "${CMAKE_SOURCE_DIR}/CMake"
 )
 
 set(CMAKE_DEBUG_POSTFIX "_d")
 
 if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-  set(CMAKE_INSTALL_PREFIX
-    "${VGears_SOURCE_DIR}/output" CACHE PATH "V-Gears install prefix" FORCE
-  )
+    set(CMAKE_INSTALL_PREFIX
+        "${VGears_SOURCE_DIR}/output" CACHE PATH "V-Gears install prefix" FORCE
+    )
 endif()
 
 find_package(Qt5Widgets REQUIRED)
@@ -108,80 +109,80 @@ find_package(OIS REQUIRED)
 
 
 #if(NOT OIS_FOUND)
-#        message(SEND_ERROR "Failed to find OIS.")
+    #message(SEND_ERROR "Failed to find OIS.")
 #endif()
 
 # Find Boost
-if (NOT OGRE_BUILD_PLATFORM_IPHONE)
-        if (WIN32)
-                set(Boost_USE_STATIC_LIBS TRUE)
-        else ()
-                # Statically linking boost to a dynamic Ogre build doesn't work on Linux 64bit
-                set(Boost_USE_STATIC_LIBS ${OGRE_STATIC})
-        endif ()
-        if (MINGW)
-                # this is probably a bug in CMake: the boost find module tries to look for
-                # boost libraries with name libboost_*, but CMake already prefixes library
-                # search names with "lib". This is the workaround.
-                set(CMAKE_FIND_LIBRARY_PREFIXES ${CMAKE_FIND_LIBRARY_PREFIXES} "")
-        endif ()
-
-        set(Boost_ADDITIONAL_VERSIONS "1.55" "1.55.0" "1.53" "1.53.0" "1.52" "1.52.0" "1.51" "1.51.0" "1.50" "1.50.0" "1.49" "1.49.0" "1.48" "1.48.0" "1.47" "1.47.0" "1.46" "1.46.0" "1.45" "1.45.0" "1.44" "1.44.0" "1.42" "1.42.0" "1.41.0" "1.41" "1.40.0" "1.40")
-        # Components that need linking (NB does not include header-only components like bind)
-        set(OGRE_BOOST_COMPONENTS thread date_time)
+if(NOT OGRE_BUILD_PLATFORM_IPHONE)
+    if(WIN32)
+        set(Boost_USE_STATIC_LIBS TRUE)
+    else()
+        # Statically linking boost to a dynamic Ogre build doesn't work on Linux 64bit
+        set(Boost_USE_STATIC_LIBS ${OGRE_STATIC})
+    endif ()
+    if(MINGW)
+        # This is probably a bug in CMake: the boost find module tries to look for
+        # boost libraries with name libboost_*, but CMake already prefixes library
+        # search names with "lib". This is the workaround.
+        set(CMAKE_FIND_LIBRARY_PREFIXES ${CMAKE_FIND_LIBRARY_PREFIXES} "")
+    endif ()
+
+    set(Boost_ADDITIONAL_VERSIONS "1.55" "1.55.0" "1.53" "1.53.0" "1.52" "1.52.0" "1.51" "1.51.0" "1.50" "1.50.0" "1.49" "1.49.0" "1.48" "1.48.0" "1.47" "1.47.0" "1.46" "1.46.0" "1.45" "1.45.0" "1.44" "1.44.0" "1.42" "1.42.0" "1.41.0" "1.41" "1.40.0" "1.40")
+    # Components that need linking (NB does not include header-only components like bind)
+    set(OGRE_BOOST_COMPONENTS thread date_time)
+    find_package(Boost COMPONENTS ${OGRE_BOOST_COMPONENTS} QUIET)
+    if (NOT Boost_FOUND)
+        set(Boost_USE_STATIC_LIBS NOT ${Boost_USE_STATIC_LIBS})
         find_package(Boost COMPONENTS ${OGRE_BOOST_COMPONENTS} QUIET)
-        if (NOT Boost_FOUND)
-                set(Boost_USE_STATIC_LIBS NOT ${Boost_USE_STATIC_LIBS})
-                find_package(Boost COMPONENTS ${OGRE_BOOST_COMPONENTS} QUIET)
-        endif()
-
-        if(Boost_FOUND AND Boost_VERSION GREATER 104900)
-                set(OGRE_BOOST_COMPONENTS thread date_time system chrono)
-                find_package(Boost COMPONENTS ${OGRE_BOOST_COMPONENTS} QUIET)
-        endif()
+    endif()
 
-        # Set up referencing of Boost
-        include_directories(${Boost_INCLUDE_DIR})
-    if (NOT APPLE)        
-    add_definitions(-DBOOST_ALL_NO_LIB)
+    if(Boost_FOUND AND Boost_VERSION GREATER 104900)
+        set(OGRE_BOOST_COMPONENTS thread date_time system chrono)
+        find_package(Boost COMPONENTS ${OGRE_BOOST_COMPONENTS} QUIET)
     endif()
 
-        set(OGRE_LIBRARIES ${OGRE_LIBRARIES} ${Boost_LIBRARIES})
+    # Set up referencing of Boost
+    include_directories(${Boost_INCLUDE_DIR})
+    if (NOT APPLE)
+        add_definitions(-DBOOST_ALL_NO_LIB)
+    endif()
 
-        find_package(Boost COMPONENTS program_options filesystem QUIET)
-        set(OGRE_LIBRARIES ${OGRE_LIBRARIES} ${Boost_LIBRARIES})
-        set(VGears_LIBRARIES ${OGRE_LIBRARIES})
-        
-        if(VGears_SOUND)
-            find_package(OpenAL REQUIRED)
-            find_package(OggVorbis REQUIRED)
-            add_definitions(-DVGears_SOUND)
-            set(VGears_LIBRARIES
-                ${VGears_LIBRARIES}
-                ${OPENAL_LIBRARY}
-                ${OGGVORBIS_LIBRARIES}
-            )
-        endif()
+    set(OGRE_LIBRARIES ${OGRE_LIBRARIES} ${Boost_LIBRARIES})
+
+    find_package(Boost COMPONENTS program_options filesystem QUIET)
+    set(OGRE_LIBRARIES ${OGRE_LIBRARIES} ${Boost_LIBRARIES})
+    set(VGears_LIBRARIES ${OGRE_LIBRARIES})
+
+    if(VGears_SOUND)
+        find_package(OpenAL REQUIRED)
+        find_package(OggVorbis REQUIRED)
+        add_definitions(-DVGears_SOUND)
+        set(VGears_LIBRARIES
+            ${VGears_LIBRARIES}
+            ${OPENAL_LIBRARY}
+            ${OGGVORBIS_LIBRARIES}
+        )
+    endif()
 
-        if(VGears_MULTITHREADING)
-            # Find Threads
-            find_package (Threads REQUIRED)
-            set(VGears_LIBRARIES
-                ${VGears_LIBRARIES}
-                ${CMAKE_THREAD_LIBS_INIT}
-            )
-        endif()
+    if(VGears_MULTITHREADING)
+        # Find Threads
+        find_package (Threads REQUIRED)
+        set(VGears_LIBRARIES
+            ${VGears_LIBRARIES}
+            ${CMAKE_THREAD_LIBS_INIT}
+        )
+    endif()
 
-        if(VGears_BUILD_TESTS)
-        message(STATUS "Looking for boost unit test..")
-            find_package(Boost COMPONENTS unit_test_framework REQUIRED)
-            set(VGears_TEST_LIBRARIES
-                ${OGRE_LIBRARIES}
-                ${Boost_LIBRARIES}
-            )
-            message(STATUS "Test libs = ${VGears_TEST_LIBRARIES}")
-            # enable CTest
-            enable_testing()
+    if(VGears_BUILD_TESTS)
+        #message(STATUS "Looking for boost unit test..")
+        find_package(Boost COMPONENTS unit_test_framework REQUIRED)
+        set(VGears_TEST_LIBRARIES
+            ${OGRE_LIBRARIES}
+            ${Boost_LIBRARIES}
+        )
+        #message(STATUS "Test libs = ${VGears_TEST_LIBRARIES}")
+        # Enable CTest.
+        enable_testing()
         endif()
 endif()
 
@@ -190,39 +191,33 @@ set(OGRE_LIBRARIES ${OGRE_LIBRARIES} ${OGRE_Overlay_LIBRARIES})
 find_package(Boost COMPONENTS unit_test_framework REQUIRED)
 
 if (Boost_LIBRARIES STREQUAL "")
-message(SEND_ERROR "Boost_LIBRARIES is not set")
+    message(SEND_ERROR "Boost_LIBRARIES is not set")
 endif()
 
 set(VGears_INCLUDE_DIRS
     ${VGears_INCLUDE_DIRS}
     ${CMAKE_CURRENT_SOURCE_DIR}/V-Gears/include/
     ${OIS_INCLUDE_DIRS}
-    #/usr/include/luabind # TODO: Autofind
-    #/usr/include/lua5.2
     ${OGRE_Overlay_INCLUDE_DIRS}
     ${OGRE_SAMPLES_INCLUDEPATH}
-    #${LUABIND_INCLUDE_DIRS}
     ${CMAKE_CURRENT_SOURCE_DIR}/lib
     ${CMAKE_CURRENT_BINARY_DIR}/lib/luajit
     ${CMAKE_CURRENT_SOURCE_DIR}/lib/luajit/src
     ${CMAKE_CURRENT_SOURCE_DIR}/lib/luabind
     ${CMAKE_CURRENT_SOURCE_DIR}/lib/luabind/luabind/detail
     ${CMAKE_CURRENT_SOURCE_DIR}/lib/tinyxml
-	#${CMAKE_CURRENT_SOURCE_DIR}/lib/SUDM
 )
 
-
 if (MSVC)
-# Build cpp files on all cores, up virtual mem for PCH's as cotire really makes the compiler scream
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /Zm193")
-# Shut up about insecure functions, as this is cross platform code we can't use the Win32 specifc functions
-add_definitions( -D_CRT_SECURE_NO_WARNINGS )
+    # Build cpp files on all cores, up virtual mem for PCH's as cotire really makes the compiler scream
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /Zm193")
+    # Shut up about insecure functions, as this is cross platform code we can't use the Win32 specifc functions
+    add_definitions( -D_CRT_SECURE_NO_WARNINGS )
 else()
-# Enable C++11, you may need to use -std=c++0x if using an older gcc compiler
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fPIC")
+    # Enable C++11, you may need to use -std=c++0x if using an older gcc compiler
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fPIC")
 endif()
 
-
 if (UNIX AND $ENV{COVERAGE}==1)
       message("Setting coverage compiler options")
       SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0") # debug, no optimisation
@@ -268,16 +263,14 @@ MESSAGE( STATUS "BOOST_ROOT:         " ${BOOST_ROOT} )
 
 INSTALL(FILES "${CMAKE_CURRENT_SOURCE_DIR}/output/field_models_and_animation_metadata.xml" DESTINATION ".")
 
-#OS SPECIFIC 
+#OS SPECIFIC
 if(WIN32)
     # On Windows generate MSI packages
     SET(CPACK_GENERATOR "WIX")
     SET(CPACK_WIX_TEMPLATE "${CMAKE_CURRENT_SOURCE_DIR}/wix.template.in")
     SET(CPACK_WIX_UPGRADE_GUID 8fbb893f-5622-4f6d-a7f6-c221f7be5d52)
-
     # TODO: Set MSI banner image, copyright info etc, also include startmenu/desktop shortcuts
     #set the name of the installer default formating is name-version-os
-
     # If empty assume release
     if ("${CMAKE_BUILD_TYPE}" STREQUAL "" OR "${CMAKE_BUILD_TYPE}" STREQUAL "Release")
         message("RELEASE installer build")
@@ -328,25 +321,25 @@ elseif(APPLE)
     install(FILES ${OSX_BIN_DIR}/liblua.dylib DESTINATION ./)
 elseif(UNIX)
     # On Linux generate TAR.GZ,DEB and RPM packages
-    #Find out what architecture are we running on and set the package architecture 
+    # Find out what architecture are we running on and set the package architecture 
     
-    # set the generic files needing to be installed
-    install( FILES ${PROJECT_SOURCE_DIR}/v-gears.png DESTINATION ./share/pixmaps/ )
-    install( FILES ${PROJECT_SOURCE_DIR}/v-gears.desktop DESTINATION ./share/applications/ )
-    install( FILES ${PROJECT_SOURCE_DIR}/debian/menu DESTINATION share/menu/ RENAME v-gears )
-    install( FILES ${PROJECT_SOURCE_DIR}/output/plugins.cfg_linux DESTINATION share/v-gears/ RENAME plugins.cfg PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ GROUP_WRITE WORLD_WRITE WORLD_READ)
-    install( FILES ${PROJECT_SOURCE_DIR}/output/resources.cfg_linux DESTINATION share/v-gears/ RENAME resources.cfg PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ GROUP_WRITE WORLD_WRITE WORLD_READ)
-    install( FILES ${PROJECT_SOURCE_DIR}/output/v-gears.cfg_linux DESTINATION share/v-gears/ RENAME v-gears.cfg PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ GROUP_WRITE WORLD_WRITE WORLD_READ)
+    # Set the generic files needing to be installed
+    install(FILES ${PROJECT_SOURCE_DIR}/v-gears.png DESTINATION ./share/pixmaps/ )
+    install(FILES ${PROJECT_SOURCE_DIR}/v-gears.desktop DESTINATION ./share/applications/ )
+    install(FILES ${PROJECT_SOURCE_DIR}/debian/menu DESTINATION share/menu/ RENAME v-gears )
+    install(FILES ${PROJECT_SOURCE_DIR}/output/plugins.cfg_linux DESTINATION share/v-gears/ RENAME plugins.cfg PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ GROUP_WRITE WORLD_WRITE WORLD_READ)
+    install(FILES ${PROJECT_SOURCE_DIR}/output/resources.cfg_linux DESTINATION share/v-gears/ RENAME resources.cfg PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ GROUP_WRITE WORLD_WRITE WORLD_READ)
+    install(FILES ${PROJECT_SOURCE_DIR}/output/v-gears.cfg_linux DESTINATION share/v-gears/ RENAME v-gears.cfg PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ GROUP_WRITE WORLD_WRITE WORLD_READ)
         
     if(EXISTS "/usr/lib/x86_64-linux-gnu/OGRE-1.9.0/RenderSystem_GL.so.1.9.0")
-      install( FILES /usr/lib/x86_64-linux-gnu/OGRE-1.9.0/RenderSystem_GL.so.1.9.0 DESTINATION lib/v-gears/plugins/ )
+        install(FILES /usr/lib/x86_64-linux-gnu/OGRE-1.9.0/RenderSystem_GL.so.1.9.0 DESTINATION lib/v-gears/plugins/ )
     elseif(EXISTS "/usr/lib/i386-linux-gnu/OGRE-1.9.0/RenderSystem_GL.so.1.9.0")
-      install( FILES /usr/lib/i386-linux-gnu/OGRE-1.9.0/RenderSystem_GL.so.1.9.0 DESTINATION lib/v-gears/plugins/ )
+        install(FILES /usr/lib/i386-linux-gnu/OGRE-1.9.0/RenderSystem_GL.so.1.9.0 DESTINATION lib/v-gears/plugins/ )
     endif()
         
     SET(CPACK_SOURCE_GENERATOR "TGZ;TZ")
     SET(CPACK_GENERATOR "TGZ")
-    #detect Distro Family DEB , RPM 
+    # Detect Distro Family DEB , RPM.
     if(EXISTS "/etc/lsb-release")
         set(DistroType DEB)
     elseif(EXISTS "/etc/debian_release")
@@ -357,19 +350,19 @@ elseif(UNIX)
     message(STATUS "Distro Detected: ${DistroType} ")
 
     if(DistroType MATCHES "DEB")
-      # Setup DEB package properties
-      MESSAGE(STATUS "DEB ADDED TO GENERATION LIST")
-      SET(CPACK_GENERATOR "${CPACK_GENERATOR};DEB")
+        # Setup DEB package properties
+        MESSAGE(STATUS "DEB ADDED TO GENERATION LIST")
+        SET(CPACK_GENERATOR "${CPACK_GENERATOR};DEB")
     endif()
     if(EXISTS "/usr/bin/rpmbuild")
-      MESSAGE(STATUS "RPM ADDED TO GENERATION LIST (RPM IS DISABLED IN CMAKELISTS)")
-    #  Uncomment to allow for rpm files to be built.   
-    #  SET(CPACK_GENERATOR "${CPACK_GENERATOR};RPM")
+        MESSAGE(STATUS "RPM ADDED TO GENERATION LIST (RPM IS DISABLED IN CMAKELISTS)")
+        # Uncomment to allow for rpm files to be built.   
+        # SET(CPACK_GENERATOR "${CPACK_GENERATOR};RPM")
     endif()
-    
+
     # Setup DEB package properties
-    SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "Chris Rizzitello <sithlord48@gmail.com>")
-    
+    # TODO
+    SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "Iñigo Valentin <i@v.com>")
     
     #Set DEBIAN INFO
     SET(CPACK_DEBIAN_PACKAGE_SECTION games)
@@ -377,35 +370,26 @@ elseif(UNIX)
     #SET(CPACK_PACKAGE_EXECUTABLE )
     EXECUTE_PROCESS(COMMAND dpkg --print-architecture OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE OUTPUT_STRIP_TRAILING_WHITESPACE)
     MESSAGE (STATUS "Architecture: ${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
-    #we should need no longer need postinst since we have added extra install steps to what it would.
+    # We should need no longer need postinst since we have added extra install steps to what it would.
     #SET(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA ${CMAKE_SOURCE_DIR}/debian/postinst )
-    #set the name to be debian package like.
+    # Set the name to be debian package like.
     SET(CPACK_PACKAGE_FILE_NAME "v-gears_${CPACK_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
     #SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libogre-1.9, libois,libboost-program-options,libboost-filesystem,libvorbis,libopenal,libboost-test,zlib1g")
     SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libogre-1.9.0, libois-1.3.0,libboost-program-options1.54.0,libboost-filesystem1.54.0,libvorbis0a,libvorbisfile3,libvorbisenc2,libopenal1,libboost-test1.54.0,zlib1g,liblua5.1-0")
-
     #Set RPM info
-      SET(CPACK_RPM_PACKAGE_SUMMARY CPACK_PACKAGE_DESCRIPTION_SUMMARY)
-      SET(CPACK_RPM_PACKAGE_NAME CPACK_PACKAGE_NAME)
-      SET(CPACK_RPM_PACKAGE_VERSION CPACK_PACKAGE_VERSION)
-      SET(CPACK_RPM_PACKAGE_RELEASE 1)
-      SET(CPACK_RPM_PACKAGE_LICENSE "GPLv3+")
-      SET(CPACK_RPM_PACKAGE_GROUP games)
-      SET(CPACK_RPM_PACKAGE_VENDOR)
-      SET(CPACK_RPM_PACKAGE_DESCRIPTION)
-      #REQUIREMENTS NEED TO BE CHECKED USING FEDORA.
-      #SET(CPACK_RPM_PACKAGE_REQUIRES "ogre,ois,boost,vorbis,lua,zlib1g")
-
+    SET(CPACK_RPM_PACKAGE_SUMMARY CPACK_PACKAGE_DESCRIPTION_SUMMARY)
+    SET(CPACK_RPM_PACKAGE_NAME CPACK_PACKAGE_NAME)
+    SET(CPACK_RPM_PACKAGE_VERSION CPACK_PACKAGE_VERSION)
+    SET(CPACK_RPM_PACKAGE_RELEASE 1)
+    SET(CPACK_RPM_PACKAGE_LICENSE "GPLv3+")
+    SET(CPACK_RPM_PACKAGE_GROUP games)
+    SET(CPACK_RPM_PACKAGE_VENDOR)
+    SET(CPACK_RPM_PACKAGE_DESCRIPTION)
+    #REQUIREMENTS NEED TO BE CHECKED USING FEDORA.
+    #SET(CPACK_RPM_PACKAGE_REQUIRES "ogre,ois,boost,vorbis,lua,zlib1g")
 endif()
 
-#SET_PROPERTY(TARGET liblua PROPERTY FOLDER "3rdparty")
-#SET_PROPERTY(TARGET buildvm PROPERTY FOLDER "3rdparty")
 SET_PROPERTY(TARGET LuaBind PROPERTY FOLDER "3rdparty")
-#SET_PROPERTY(TARGET luajit PROPERTY FOLDER "3rdparty")
-#SET_PROPERTY(TARGET minilua PROPERTY FOLDER "3rdparty")
-#SET_PROPERTY(TARGET TinyXml PROPERTY FOLDER "3rdparty")
-#SET_PROPERTY(TARGET Sudm_Lib PROPERTY FOLDER "v-gears")
-
 
 INCLUDE(CPack)
-#End of install instructions
+#End of install instructions

PlugIns/Data/CMakeLists.txt

@@ -1,19 +1,19 @@
 set(V-Gears_SOURCE_DIR ../../V-Gears)
 
-# define header and source files for the library
+# Define header and source files for the library.
 set(HEADER_FILES
-  ${V-Gears_SOURCE_DIR}/include/VGearsPrerequisites.h
-  ${V-Gears_SOURCE_DIR}/include/common/VGearsManualObject.h
-  ${V-Gears_SOURCE_DIR}/include/common/VGearsStringUtil.h
-  ${V-Gears_SOURCE_DIR}/include/common/TypeDefine.h
-  include/VGearsDataPlugin.h
+    ${V-Gears_SOURCE_DIR}/include/VGearsPrerequisites.h
+    ${V-Gears_SOURCE_DIR}/include/common/VGearsManualObject.h
+    ${V-Gears_SOURCE_DIR}/include/common/VGearsStringUtil.h
+    ${V-Gears_SOURCE_DIR}/include/common/TypeDefine.h
+    include/VGearsDataPlugin.h
 )
 set(SOURCE_FILES
-  ${V-Gears_SOURCE_DIR}/src/common/VGearsManualObject.cpp
-  ${V-Gears_SOURCE_DIR}/src/common/VGearsStringUtil.cpp
-  ${V-Gears_SOURCE_DIR}/src/common/TypeDefine.cpp
-  src/VGearsDataPlugin.cpp
-  src/VGearsDataPluginDll.cpp
+    ${V-Gears_SOURCE_DIR}/src/common/VGearsManualObject.cpp
+    ${V-Gears_SOURCE_DIR}/src/common/VGearsStringUtil.cpp
+    ${V-Gears_SOURCE_DIR}/src/common/TypeDefine.cpp
+    src/VGearsDataPlugin.cpp
+    src/VGearsDataPluginDll.cpp
 )
 
 include_directories(
@@ -25,35 +25,32 @@ include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/../../lib
 )
 
-#defines
+# Defines.
 #add_definitions(-DBOOST_ALL_DYN_LINK)
 
 add_library(DataPlugin MODULE
-  ${HEADER_FILES}
-  ${SOURCE_FILES}
+    ${HEADER_FILES}
+    ${SOURCE_FILES}
 )
 SET_PROPERTY(TARGET DataPlugin PROPERTY FOLDER "v-gears")
 
 set_target_properties(DataPlugin PROPERTIES
-  PREFIX ${PLUGIN_PREFIX}
-  OUTPUT_NAME Data
+    PREFIX ${PLUGIN_PREFIX}
+    OUTPUT_NAME Data
 )
 
 set(LIBRARIES
-  ${OGRE_LIBRARIES} 
-  #FinalFantasy7
-  v-gears-data
+    ${OGRE_LIBRARIES}
+    v-gears-data
 )
 
 target_link_libraries(DataPlugin ${LIBRARIES})
 
 if(NOT VGEARS_STATIC)
-  set_target_properties(DataPlugin PROPERTIES
-    COMPILE_DEFINITIONS VGEARS_DATAPLUGIN_EXPORTS
-  )
+    set_target_properties(DataPlugin PROPERTIES COMPILE_DEFINITIONS VGEARS_DATAPLUGIN_EXPORTS)
     if(WIN32 OR APPLE)
-      install(TARGETS DataPlugin LIBRARY DESTINATION .)
+        install(TARGETS DataPlugin LIBRARY DESTINATION .)
     else()
-      install(TARGETS DataPlugin LIBRARY DESTINATION ./lib/v-gears/plugins/ )
+        install(TARGETS DataPlugin LIBRARY DESTINATION ./lib/v-gears/plugins/ )
     endif()
 endif()

SupportedGames/FinalFantasy7/CMakeLists.txt

@@ -1,24 +1,21 @@
 # define header and source files for the library
 set(HEADER_FILES
-  include/common/FF7NameLookup.h
-  include/data/FF7ModelListFile.h
-  include/data/FF7ModelListFileManager.h
-  include/data/FF7ModelListFileSerializer.h
-  include/map/FF7WalkmeshFileSerializer.h
-  include/FF7Common.h
-  #include/FF7Character.h
+    include/common/FF7NameLookup.h
+    include/data/FF7ModelListFile.h
+    include/data/FF7ModelListFileManager.h
+    include/data/FF7ModelListFileSerializer.h
+    include/map/FF7WalkmeshFileSerializer.h
+    include/FF7Common.h
 )
 set(SOURCE_FILES
-  src/common/FF7NameLookup.cpp
-  src/data/FF7ModelListFile.cpp
-  src/data/FF7ModelListFileManager.cpp
-  src/data/FF7ModelListFileSerializer.cpp
-  src/map/FF7WalkmeshFileSerializer.cpp
-  src/FF7Common.cpp
-  #src/FF7Character.cpp
+    src/common/FF7NameLookup.cpp
+    src/data/FF7ModelListFile.cpp
+    src/data/FF7ModelListFileManager.cpp
+    src/data/FF7ModelListFileSerializer.cpp
+    src/map/FF7WalkmeshFileSerializer.cpp
+    src/FF7Common.cpp
 )
 
-
 include_directories(
     ${VGears_INCLUDE_DIRS}
     ${VGears_SOURCE_DIR}/V-Gears/include
@@ -26,8 +23,8 @@ include_directories(
 )
 
 add_library(FinalFantasy7 STATIC
-  ${HEADER_FILES}
-  ${SOURCE_FILES}
+    ${HEADER_FILES}
+    ${SOURCE_FILES}
 )
 SET_PROPERTY(TARGET FinalFantasy7 PROPERTY FOLDER "v-gears")
 
@@ -37,4 +34,4 @@ set(LIBRARIES
     V-Gears
 )
 
-target_link_libraries(FinalFantasy7 ${LIBRARIES})
+target_link_libraries(FinalFantasy7 ${LIBRARIES})

Tests/CMakeLists.txt

@@ -3,9 +3,7 @@ add_definitions(
 )
 
 if(UNIX OR APPLE)
-    add_definitions(
-        -DBOOST_TEST_DYN_LINK
-    )
+    add_definitions(-DBOOST_TEST_DYN_LINK)
 endif()
 
 set(V-Gears_SOURCE_DIR ${VGears_SOURCE_DIR}/V-Gears)

Tests/FinalFantasy7/CMakeLists.txt

@@ -9,34 +9,23 @@ include_directories(
 set(LIBRARIES
     ${VGears_TEST_LIBRARIES}
     FinalFantasy7
-	V-Gears
-	v-gears-data
+    V-Gears
+    v-gears-data
 )
 
-add_executable(TestFF7FLevelFileSerializer
-    src/test_FF7FLevelFileSerializer
-)
+add_executable(TestFF7FLevelFileSerializer src/test_FF7FLevelFileSerializer)
 SET_PROPERTY(TARGET TestFF7FLevelFileSerializer PROPERTY FOLDER "tests")
 
-
 target_link_libraries(TestFF7FLevelFileSerializer ${LIBRARIES})
-#add_test(NAME TestFF7FLevelFileSerializer COMMAND TestFF7FLevelFileSerializer)
 
-
-add_executable(TestFF7ModelListFileSerializer
-    src/test_FF7ModelListFileSerializer.cpp
-)
+add_executable(TestFF7ModelListFileSerializer src/test_FF7ModelListFileSerializer.cpp)
 SET_PROPERTY(TARGET TestFF7ModelListFileSerializer PROPERTY FOLDER "tests")
 
-
 target_link_libraries(TestFF7ModelListFileSerializer ${LIBRARIES})
 add_test(NAME TestFF7ModelListFileSerializer COMMAND TestFF7ModelListFileSerializer)
 
-
-add_executable(TestFF7WalkmeshFileSerializer
-    src/test_FF7WalkmeshFileSerializer.cpp
-)
+add_executable(TestFF7WalkmeshFileSerializer src/test_FF7WalkmeshFileSerializer.cpp)
 SET_PROPERTY(TARGET TestFF7WalkmeshFileSerializer PROPERTY FOLDER "tests")
 
 target_link_libraries(TestFF7WalkmeshFileSerializer ${LIBRARIES})
-add_test(NAME TestFF7WalkmeshFileSerializer COMMAND TestFF7WalkmeshFileSerializer)
+add_test(NAME TestFF7WalkmeshFileSerializer COMMAND TestFF7WalkmeshFileSerializer)

Tests/VGearsMain/CMakeLists.txt

@@ -8,71 +8,53 @@ include_directories(
 set(LIBRARIES
     ${VGears_TEST_LIBRARIES}
     V-Gears
-	v-gears-data
+    v-gears-data
 )
 
-add_executable(TestVGearsAFileSerializer
-    src/test_VGearsAFileSerializer.cpp
-)
+add_executable(TestVGearsAFileSerializer src/test_VGearsAFileSerializer.cpp)
 SET_PROPERTY(TARGET TestVGearsAFileSerializer PROPERTY FOLDER "tests")
 
 target_link_libraries(TestVGearsAFileSerializer ${LIBRARIES})
 add_test(NAME TestVGearsAFileSerializer COMMAND TestVGearsAFileSerializer)
 
-
-add_executable(TestVGearsMapFileXMLSerializer
-    src/test_VGearsMapFileXMLSerializer.cpp
-)
+add_executable(TestVGearsMapFileXMLSerializer src/test_VGearsMapFileXMLSerializer.cpp)
 SET_PROPERTY(TARGET TestVGearsMapFileXMLSerializer PROPERTY FOLDER "tests")
 
 target_link_libraries(TestVGearsMapFileXMLSerializer ${LIBRARIES})
 add_test(NAME TestVGearsMapFileXMLSerializer COMMAND TestVGearsMapFileXMLSerializer)
 
-# field walk mesh
-add_executable(TestVGearsWalkmeshFileXMLSerializer
-    src/test_VGearsWalkmeshFileXMLSerializer.cpp
-)
+# Field walk mesh.
+add_executable(TestVGearsWalkmeshFileXMLSerializer src/test_VGearsWalkmeshFileXMLSerializer.cpp)
 SET_PROPERTY(TARGET TestVGearsWalkmeshFileXMLSerializer PROPERTY FOLDER "tests")
 
 target_link_libraries(TestVGearsWalkmeshFileXMLSerializer ${LIBRARIES})
 add_test(NAME TestVGearsWalkmeshFileXMLSerializer COMMAND TestVGearsWalkmeshFileXMLSerializer)
 
-# LGP archive
-add_executable(TestVGearsLGPArchive
-    src/test_VGearsLGPArchive.cpp
-)
+# LGP archive.
+add_executable(TestVGearsLGPArchive src/test_VGearsLGPArchive.cpp)
 SET_PROPERTY(TARGET TestVGearsLGPArchive PROPERTY FOLDER "tests")
 
 target_link_libraries(TestVGearsLGPArchive ${LIBRARIES})
 add_test(NAME TestVGearsLGPArchive COMMAND TestVGearsLGPArchive)
 
-# HRC archive
-add_executable(TestVGearsHRCSerializer
-    src/test_VGearsHRCSerializer.cpp
-)
+# HRC archive.
+add_executable(TestVGearsHRCSerializer src/test_VGearsHRCSerializer.cpp)
 SET_PROPERTY(TARGET TestVGearsHRCSerializer PROPERTY FOLDER "tests")
 
 target_link_libraries(TestVGearsHRCSerializer ${LIBRARIES})
 add_test(NAME TestVGearsHRCSerializer COMMAND TestVGearsHRCSerializer)
 
-# world map
-add_executable(TestMapSerializer
-    src/test_MapSerializer.cpp
-)
+# World Map
+add_executable(TestMapSerializer src/test_MapSerializer.cpp)
 SET_PROPERTY(TARGET TestMapSerializer PROPERTY FOLDER "tests")
 
 target_link_libraries(TestMapSerializer ${LIBRARIES})
-# TODO FIX ME - test not currently working
+# TODO FIX ME - test not currently working.
 #add_test(TestMapSerializer TestMapSerializer)
 
-
-add_executable(TestTxzSerializer
-    src/test_TxzSerializer.cpp
-)
+add_executable(TestTxzSerializer src/test_TxzSerializer.cpp)
 SET_PROPERTY(TARGET TestTxzSerializer PROPERTY FOLDER "tests")
 
-
 target_link_libraries(TestTxzSerializer ${LIBRARIES})
 # TODO FIX ME - test not currently working
-#add_test(TestTxzSerializer TestTxzSerializer)
-
+#add_test(TestTxzSerializer TestTxzSerializer)

V-Gears-Installer/CMakeLists.txt

@@ -1,26 +1,25 @@
+# Include directories.
 include_directories(
     ${VGears_INCLUDE_DIRS}
     ${VGears_SOURCE_DIR}/V-Gears/include
     ${VGears_SOURCE_DIR}/SupportedGames/FinalFantasy7/include
-    #${CMAKE_CURRENT_SOURCE_DIR}/common/include
     ${CMAKE_CURRENT_SOURCE_DIR}/include
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${ZLIB_INCLUDE_DIRS}
 )
 
-# define header and source files for the library
+# Define headers and source files for the installer.
 set(HEADER_FILES
-./include/common/FontFile.h
-./include/VGearsUtility.h
-./include/common/Logger.h
-./include/common/Surface.h
-./include/common/TimToVram.h
-./include/common/BinGZipFile.h
-./include/common/OgreBase.h
-./include/common/OgreGenUtilites.h
-./include/common/Vram.h
-./include/common/DrawSkeleton.h
-
+    include/common/FontFile.h
+    include/VGearsUtility.h
+    include/common/Logger.h
+    include/common/Surface.h
+    include/common/TimToVram.h
+    include/common/BinGZipFile.h
+    include/common/OgreBase.h
+    include/common/OgreGenUtilites.h
+    include/common/Vram.h
+    include/common/DrawSkeleton.h
     include/common/Logger.h
     include/decompiler/sudm.h
     include/decompiler/decompiler_codegen.h
@@ -42,9 +41,6 @@ set(HEADER_FILES
     include/decompiler/field/ff7_field_disassembler.h
     include/decompiler/field/ff7_field_engine.h
     include/decompiler/field/ff7_field_codegen.h
-    #include/decompiler/world/ff7_world_disassembler.h
-    #include/decompiler/world/ff7_world_engine.h
-    #include/decompiler/world/ff7_world_codegen.h
     include/common/algorithm.h
     include/common/noncopyable.h
     include/common/scummsys.h
@@ -57,16 +53,16 @@ set(HEADER_FILES
 
 
 set(SOURCE_FILES
-./src/common/Logger.cpp
-./src/common/BinGZipFile.cpp
-./src/common/DrawSkeleton.cpp
-./src/common/Surface.cpp
-./src/common/OgreGenUtilites.cpp
-./src/common/FontFile.cpp
-./src/common/TimToVram.cpp
-./src/common/Vram.cpp
-./src/common/OgreBase.cpp
-./src/VGearsUtility.cpp
+    src/common/Logger.cpp
+    src/common/BinGZipFile.cpp
+    src/common/DrawSkeleton.cpp
+    src/common/Surface.cpp
+    src/common/OgreGenUtilites.cpp
+    src/common/FontFile.cpp
+    src/common/TimToVram.cpp
+    src/common/Vram.cpp
+    src/common/OgreBase.cpp
+    src/VGearsUtility.cpp
     src/decompiler/sudm.cpp
     src/decompiler/decompiler_codegen.cpp
     src/decompiler/control_flow.cpp
@@ -82,20 +78,17 @@ set(SOURCE_FILES
     src/decompiler/field/ff7_field_disassembler.cpp
     src/decompiler/field/ff7_field_engine.cpp
     src/decompiler/field/ff7_field_codegen.cpp
-    #src/decompiler/world/ff7_world_disassembler.cpp
-    #src/decompiler/world/ff7_world_engine.cpp
-    #src/decompiler/world/ff7_world_codegen.cpp
     src/common/str.cpp
 )
 
-# For SUDM
+# For SUDM. TODO: Add elses.
 if (UNIX)
     add_definitions(-DPOSIX)
 endif()
 
 add_library(Utility STATIC
-  ${HEADER_FILES}
-  ${SOURCE_FILES}
+    ${HEADER_FILES}
+    ${SOURCE_FILES}
 )
 
 target_link_libraries(Utility
@@ -105,60 +98,53 @@ target_link_libraries(Utility
 )
 SET_PROPERTY(TARGET Utility PROPERTY FOLDER "utilities")
 
-#add_subdirectory(flevel)
-#add_subdirectory(lzs)
-#add_subdirectory(v-gears-launcher)
-
-#DEBUG, no optimizations
+# DEBUG, no optimizations
 #SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -rdynamic -O0")
 
 find_package ( Qt5Widgets REQUIRED )
-#include ( ${QT_USE_FILE} )
 include_directories (
     ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}
     ${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR}
-    )
+)
 set ( v-gears-launcher_HDRS
     include/mainwindow.h
     include/ff7DataInstaller.h
     include/ff7FieldTextWriter.h
-    )
+)
 
-set ( v-gears-launcher_SRCS
+set(v-gears-launcher_SRCS
     src/main.cpp
     src/mainwindow.cpp
     src/ff7DataInstaller.cpp
     src/ff7FieldTextWriter.cpp
-    )
+)
 
-set ( v-gears-launcher_UIS
+set(v-gears-launcher_UIS
     src/mainwindow.ui
-    )
+)
 QT5_WRAP_UI(UIS ${v-gears-launcher_UIS})
 
 message(UIS: ${UIS})
 
-set ( v-gears-launcher_MOCS
+set(v-gears-launcher_MOCS
     include/mainwindow.h
-    )
+)
 QT5_WRAP_CPP(MOCS ${v-gears-launcher_MOCS})
 
-add_definitions(
-    -DVGEARS_ADD_MANAGERS
-)
-add_executable ( v-gears-launcher ${v-gears-launcher_SRCS} ${UIS} ${RSCS} ${TRS} ${MOCS} )
+add_definitions(-DVGEARS_ADD_MANAGERS)
+add_executable (v-gears-launcher ${v-gears-launcher_SRCS} ${UIS} ${RSCS} ${TRS} ${MOCS})
 
 SET_PROPERTY(TARGET v-gears-launcher PROPERTY FOLDER "utilities")
 
 if (APPLE)
-target_link_libraries(v-gears-launcher "-framework CoreFoundation -framework Cocoa -framework IOKit")
+    target_link_libraries(v-gears-launcher "-framework CoreFoundation -framework Cocoa -framework IOKit")
 endif()
 
 if(WIN32)
-  set_target_properties(v-gears-launcher PROPERTIES WIN32_EXECUTABLE ON)
-  if (MSVC)
-    set_target_properties(v-gears-launcher PROPERTIES LINK_FLAGS "/SUBSYSTEM:CONSOLE")
-  endif()
+    set_target_properties(v-gears-launcher PROPERTIES WIN32_EXECUTABLE ON)
+    if (MSVC)
+        set_target_properties(v-gears-launcher PROPERTIES LINK_FLAGS "/SUBSYSTEM:CONSOLE")
+    endif()
 endif()
 
 set(LIBRARIES
@@ -168,18 +154,12 @@ set(LIBRARIES
     #Sudm_Lib
 )
 
-
 find_package(Qt5 COMPONENTS Widgets REQUIRED)
-
 find_package(Qt5 COMPONENTS Core REQUIRED)
-
-#target_link_libraries ( v-gears-launcher  ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${LIBRARIES} )
 target_link_libraries ( v-gears-launcher  Qt5::Widgets Qt5::Core  ${LIBRARIES} )
 
 if(WIN32 OR APPLE)
-  install(TARGETS v-gears-launcher DESTINATION . ) 
+    install(TARGETS v-gears-launcher DESTINATION .)
 else()
-  install(TARGETS v-gears-launcher RUNTIME DESTINATION bin ) 
-endif()
-
-
+    install(TARGETS v-gears-launcher RUNTIME DESTINATION bin)
+endif()

V-Gears/CMakeLists.txt

@@ -1,308 +1,306 @@
-# define header and source files for the library
+# Define header and source files for V-Gears
 set(HEADER_FILES
-  include/modules/worldmap/WorldMapModule.h
-
-  include/common/VGearsManualObject.h
-  include/common/VGearsResource.h
-  include/common/VGearsStringUtil.h
-  include/common/TypeDefine.h
-  include/common/LzsFile.h
-  include/common/File.h
-  include/common/FileSystem.h
-  include/common/make_unique.h
-  include/map/VGearsBackground2DFile.h
-  include/map/VGearsBackground2DFileManager.h
-  include/map/VGearsBackground2DFileXMLSerializer.h
-  include/map/VGearsTile.h
-  include/map/VGearsMapFile.h
-  include/map/VGearsMapFileManager.h
-  include/map/VGearsMapFileXMLSerializer.h
-  include/map/VGearsWalkmeshFile.h
-  include/map/VGearsWalkmeshFileManager.h
-  include/map/VGearsWalkmeshFileXMLSerializer.h
-  include/LuaIncludes.h
-  include/VGearsGameState.h
-  include/VGearsPrerequisites.h
-  include/core/particles/emitters/ParticlePointEmitter.h
-  include/core/particles/emitters/ParticlePointEmitterFactory.h
-  include/core/particles/renderer/ParticleEntityAdditionalData.h
-  include/core/particles/renderer/ParticleEntityRenderer.h
-  include/core/particles/renderer/ParticleEntityRendererDictionary.h
-  include/core/particles/renderer/ParticleEntityRendererFactory.h
-  include/core/particles/Particle.h
-  include/core/particles/ParticleAdditionalData.h
-  include/core/particles/ParticleEmitter.h
-  include/core/particles/ParticleEmitterDictionary.h
-  include/core/particles/ParticleEmitterFactory.h
-  include/core/particles/ParticleEmitterTranslator.h
-  include/core/particles/ParticlePool.h
-  include/core/particles/ParticlePoolMap.h
-  include/core/particles/ParticleRenderer.h
-  include/core/particles/ParticleRendererFactory.h
-  include/core/particles/ParticleRendererTranslator.h
-  include/core/particles/ParticleSystem.h
-  include/core/particles/ParticleSystemFactory.h
-  include/core/particles/ParticleSystemManager.h
-  include/core/particles/ParticleSystemTranslator.h
-  include/core/particles/ParticleSystemTranslatorManager.h
-  include/core/particles/ParticleTechnique.h
-  include/core/particles/ParticleTechniqueTranslator.h
-  include/core/particles/ParticleVisual.h
-  include/core/Assert.h
-  include/core/Background2D.h
-  include/core/Background2DAnimation.h
-  include/core/CameraManager.h
-  include/core/CameraManagerCommands.h
-  include/core/ConfigCmd.h
-  include/core/ConfigCmdManager.h
-  include/core/ConfigCmdManagerCommands.h
-  include/core/ConfigFile.h
-  include/core/ConfigVar.h
-  include/core/ConfigVarManager.h
-  include/core/Console.h
-  include/core/DebugDraw.h
-  include/core/Entity.h
-  include/core/EntityCollision.h
-  include/core/EntityDirection.h
-  include/core/EntityManager.h
-  include/core/EntityModel.h
-  include/core/EntityPoint.h
-  include/core/EntityTrigger.h
-  include/core/Event.h
-  include/core/GameFrameListener.h
-  include/core/InputManager.h
-  include/core/InputManagerCommands.h
-  include/core/Logger.h
-  include/core/Module.h
-  include/core/ScriptManager.h
-  include/core/ScriptManagerBinds.h
-  include/core/ScriptManagerCommands.h
-  include/core/Timer.h
-  include/core/UiAnimation.h
-  include/core/UiFont.h
-  include/core/UiManager.h
-  include/core/UiSprite.h
-  include/core/UiTextArea.h
-  include/core/UiWidget.h
-  include/core/Utilites.h
-  include/core/Walkmesh.h
-  include/core/XmlBackground2DFile.h
-  include/core/XmlFile.h
-  include/core/XmlFontFile.h
-  include/core/XmlFontsFile.h
-  include/core/XmlMapFile.h
-  #include/core/XmlMapsFile.h
-  include/core/XmlPrototypesFile.h
-  include/core/XmlScreenFile.h
-  include/core/XmlScreensFile.h
-  include/core/XmlScriptsFile.h
-  include/core/XmlTextFile.h
-  include/core/XmlTextsFile.h
-  include/core/DialogsManager.h
-  include/core/ScriptManagerBinds.h
-  include/core/TextManager.h
-  include/core/TextManagerCommands.h
-  #include/viewer/ViewerModule.h
-  include/data/VGearsXMLSerializer.h
-  include/common/FinalFantasy7/FF7NameLookup.h
-  include/map/FinalFantasy7/FF7WalkmeshFileSerializer.h
-  include/FF7Character.h
-  include/FF7Common.h
+    include/modules/worldmap/WorldMapModule.h
+    include/common/VGearsManualObject.h
+    include/common/VGearsResource.h
+    include/common/VGearsStringUtil.h
+    include/common/TypeDefine.h
+    include/common/LzsFile.h
+    include/common/File.h
+    include/common/FileSystem.h
+    include/common/make_unique.h
+    include/map/VGearsBackground2DFile.h
+    include/map/VGearsBackground2DFileManager.h
+    include/map/VGearsBackground2DFileXMLSerializer.h
+    include/map/VGearsTile.h
+    include/map/VGearsMapFile.h
+    include/map/VGearsMapFileManager.h
+    include/map/VGearsMapFileXMLSerializer.h
+    include/map/VGearsWalkmeshFile.h
+    include/map/VGearsWalkmeshFileManager.h
+    include/map/VGearsWalkmeshFileXMLSerializer.h
+    include/LuaIncludes.h
+    include/VGearsGameState.h
+    include/VGearsPrerequisites.h
+    include/core/particles/emitters/ParticlePointEmitter.h
+    include/core/particles/emitters/ParticlePointEmitterFactory.h
+    include/core/particles/renderer/ParticleEntityAdditionalData.h
+    include/core/particles/renderer/ParticleEntityRenderer.h
+    include/core/particles/renderer/ParticleEntityRendererDictionary.h
+    include/core/particles/renderer/ParticleEntityRendererFactory.h
+    include/core/particles/Particle.h
+    include/core/particles/ParticleAdditionalData.h
+    include/core/particles/ParticleEmitter.h
+    include/core/particles/ParticleEmitterDictionary.h
+    include/core/particles/ParticleEmitterFactory.h
+    include/core/particles/ParticleEmitterTranslator.h
+    include/core/particles/ParticlePool.h
+    include/core/particles/ParticlePoolMap.h
+    include/core/particles/ParticleRenderer.h
+    include/core/particles/ParticleRendererFactory.h
+    include/core/particles/ParticleRendererTranslator.h
+    include/core/particles/ParticleSystem.h
+    include/core/particles/ParticleSystemFactory.h
+    include/core/particles/ParticleSystemManager.h
+    include/core/particles/ParticleSystemTranslator.h
+    include/core/particles/ParticleSystemTranslatorManager.h
+    include/core/particles/ParticleTechnique.h
+    include/core/particles/ParticleTechniqueTranslator.h
+    include/core/particles/ParticleVisual.h
+    include/core/Assert.h
+    include/core/Background2D.h
+    include/core/Background2DAnimation.h
+    include/core/CameraManager.h
+    include/core/CameraManagerCommands.h
+    include/core/ConfigCmd.h
+    include/core/ConfigCmdManager.h
+    include/core/ConfigCmdManagerCommands.h
+    include/core/ConfigFile.h
+    include/core/ConfigVar.h
+    include/core/ConfigVarManager.h
+    include/core/Console.h
+    include/core/DebugDraw.h
+    include/core/Entity.h
+    include/core/EntityCollision.h
+    include/core/EntityDirection.h
+    include/core/EntityManager.h
+    include/core/EntityModel.h
+    include/core/EntityPoint.h
+    include/core/EntityTrigger.h
+    include/core/Event.h
+    include/core/GameFrameListener.h
+    include/core/InputManager.h
+    include/core/InputManagerCommands.h
+    include/core/Logger.h
+    include/core/Module.h
+    include/core/ScriptManager.h
+    include/core/ScriptManagerBinds.h
+    include/core/ScriptManagerCommands.h
+    include/core/Timer.h
+    include/core/UiAnimation.h
+    include/core/UiFont.h
+    include/core/UiManager.h
+    include/core/UiSprite.h
+    include/core/UiTextArea.h
+    include/core/UiWidget.h
+    include/core/Utilites.h
+    include/core/Walkmesh.h
+    include/core/XmlBackground2DFile.h
+    include/core/XmlFile.h
+    include/core/XmlFontFile.h
+    include/core/XmlFontsFile.h
+    include/core/XmlMapFile.h
+    include/core/XmlPrototypesFile.h
+    include/core/XmlScreenFile.h
+    include/core/XmlScreensFile.h
+    include/core/XmlScriptsFile.h
+    include/core/XmlTextFile.h
+    include/core/XmlTextsFile.h
+    include/core/DialogsManager.h
+    include/core/ScriptManagerBinds.h
+    include/core/TextManager.h
+    include/core/TextManagerCommands.h
+    include/data/VGearsXMLSerializer.h
+    include/common/FinalFantasy7/FF7NameLookup.h
+    include/map/FinalFantasy7/FF7WalkmeshFileSerializer.h
+    include/FF7Character.h
+    include/FF7Common.h
 )
 
 set(HEADER_FILES_DATA
-  include/common/VGearsApplication.h
-include/data/worldmap/MapFile.h
-  include/data/worldmap/MapFileManager.h
-  include/data/worldmap/MapFileSerializer.h
-  include/data/worldmap/TxzFile.h
-  include/data/worldmap/TxzFileManager.h
-  include/data/worldmap/TxzFileSerializer.h
-  include/data/VGearsAFile.h
-  include/data/VGearsAFileManager.h
-  include/data/VGearsAFileSerializer.h
-  include/data/VGearsBackgroundFile.h
-  include/data/VGearsBackgroundFileManager.h
-  include/data/VGearsBackgroundFileSerializer.h
-  include/data/VGearsBackgroundTextureLoader.h
-  include/data/VGearsCameraMatrixFile.h
-  include/data/VGearsCameraMatrixFileManager.h
-  include/data/VGearsCameraMatrixFileSerializer.h
-  include/data/VGearsFLevelBackground2DLoader.h
-  include/data/VGearsFLevelFile.h
-  include/data/VGearsFLevelFileManager.h
-  include/data/VGearsFLevelFileSerializer.h
-  include/data/VGearsFLevelTextureLoader.h
-  include/data/VGearsHRCFile.h
-  include/data/VGearsHRCFileManager.h
-  include/data/VGearsHRCFileSerializer.h
-  include/data/VGearsHRCMeshLoader.h
-  include/data/VGearsHRCSkeletonLoader.h
-  include/data/VGearsLGPArchive.h
-  include/data/VGearsLGPArchiveFactory.h
-  include/data/VGearsLGPArchiveSerializer.h
-  include/data/VGearsLZSDataStream.h
-  include/data/VGearsLZSFLevelFile.h
-  include/data/VGearsLZSFLevelFileManager.h
-  include/data/VGearsPaletteFile.h
-  include/data/VGearsPaletteFileManager.h
-  include/data/VGearsPaletteFileSerializer.h
-  include/data/VGearsPFile.h
-  include/data/VGearsPFileManager.h
-  include/data/VGearsPFileSerializer.h
-  include/data/VGearsRSDFile.h
-  include/data/VGearsRSDFileManager.h
-  include/data/VGearsRSDFileSerializer.h
-  include/data/VGearsSerializer.h
-  include/data/VGearsTexCodec.h
-  include/data/VGearsTexFile.h
-  include/data/VGearsTriggersFile.h
-  include/data/VGearsMapListFile.h
-  include/data/FinalFantasy7/FF7ModelListFile.h
-  include/data/FinalFantasy7/FF7ModelListFileManager.h
-  include/data/FinalFantasy7/FF7ModelListFileSerializer.h
+    include/common/VGearsApplication.h
+    include/data/worldmap/MapFile.h
+    include/data/worldmap/MapFileManager.h
+    include/data/worldmap/MapFileSerializer.h
+    include/data/worldmap/TxzFile.h
+    include/data/worldmap/TxzFileManager.h
+    include/data/worldmap/TxzFileSerializer.h
+    include/data/VGearsAFile.h
+    include/data/VGearsAFileManager.h
+    include/data/VGearsAFileSerializer.h
+    include/data/VGearsBackgroundFile.h
+    include/data/VGearsBackgroundFileManager.h
+    include/data/VGearsBackgroundFileSerializer.h
+    include/data/VGearsBackgroundTextureLoader.h
+    include/data/VGearsCameraMatrixFile.h
+    include/data/VGearsCameraMatrixFileManager.h
+    include/data/VGearsCameraMatrixFileSerializer.h
+    include/data/VGearsFLevelBackground2DLoader.h
+    include/data/VGearsFLevelFile.h
+    include/data/VGearsFLevelFileManager.h
+    include/data/VGearsFLevelFileSerializer.h
+    include/data/VGearsFLevelTextureLoader.h
+    include/data/VGearsHRCFile.h
+    include/data/VGearsHRCFileManager.h
+    include/data/VGearsHRCFileSerializer.h
+    include/data/VGearsHRCMeshLoader.h
+    include/data/VGearsHRCSkeletonLoader.h
+    include/data/VGearsLGPArchive.h
+    include/data/VGearsLGPArchiveFactory.h
+    include/data/VGearsLGPArchiveSerializer.h
+    include/data/VGearsLZSDataStream.h
+    include/data/VGearsLZSFLevelFile.h
+    include/data/VGearsLZSFLevelFileManager.h
+    include/data/VGearsPaletteFile.h
+    include/data/VGearsPaletteFileManager.h
+    include/data/VGearsPaletteFileSerializer.h
+    include/data/VGearsPFile.h
+    include/data/VGearsPFileManager.h
+    include/data/VGearsPFileSerializer.h
+    include/data/VGearsRSDFile.h
+    include/data/VGearsRSDFileManager.h
+    include/data/VGearsRSDFileSerializer.h
+    include/data/VGearsSerializer.h
+    include/data/VGearsTexCodec.h
+    include/data/VGearsTexFile.h
+    include/data/VGearsTriggersFile.h
+    include/data/VGearsMapListFile.h
+    include/data/FinalFantasy7/FF7ModelListFile.h
+    include/data/FinalFantasy7/FF7ModelListFileManager.h
+    include/data/FinalFantasy7/FF7ModelListFileSerializer.h
 )
 
 set(SOURCE_FILES_DATA
-  src/common/VGearsApplication.cpp
-  src/data/VGearsAFile.cpp
-  src/data/VGearsAFileManager.cpp
-  src/data/VGearsAFileSerializer.cpp
-  src/data/worldmap/MapFile.cpp
-  src/data/worldmap/MapFileManager.cpp
-  src/data/worldmap/MapFileSerializer.cpp
-  src/data/worldmap/TxzFile.cpp
-  src/data/worldmap/TxzFileManager.cpp
-  src/data/worldmap/TxzFileSerializer.cpp
-  src/data/VGearsBackgroundFile.cpp
-  src/data/VGearsBackgroundFileManager.cpp
-  src/data/VGearsBackgroundFileSerializer.cpp
-  src/data/VGearsBackgroundTextureLoader.cpp
-  src/data/VGearsCameraMatrixFile.cpp
-  src/data/VGearsCameraMatrixFileManager.cpp
-  src/data/VGearsCameraMatrixFileSerializer.cpp
-  src/data/VGearsFLevelBackground2DLoader.cpp
-  src/data/VGearsFLevelFile.cpp
-  src/data/VGearsFLevelFileManager.cpp
-  src/data/VGearsFLevelFileSerializer.cpp
-  src/data/VGearsFLevelTextureLoader.cpp
-  src/data/VGearsHRCFile.cpp
-  src/data/VGearsHRCFileManager.cpp
-  src/data/VGearsHRCFileSerializer.cpp
-  src/data/VGearsHRCMeshLoader.cpp
-  src/data/VGearsHRCSkeletonLoader.cpp
-  src/data/VGearsLGPArchive.cpp
-  src/data/VGearsLGPArchiveFactory.cpp
-  src/data/VGearsLGPArchiveSerializer.cpp
-  src/data/VGearsLZSDataStream.cpp
-  src/data/VGearsLZSFLevelFile.cpp
-  src/data/VGearsLZSFLevelFileManager.cpp
-  src/data/VGearsPaletteFile.cpp
-  src/data/VGearsPaletteFileManager.cpp
-  src/data/VGearsPaletteFileSerializer.cpp
-  src/data/VGearsPFile.cpp
-  src/data/VGearsPFileManager.cpp
-  src/data/VGearsPFileSerializer.cpp
-  src/data/VGearsRSDFile.cpp
-  src/data/VGearsRSDFileManager.cpp
-  src/data/VGearsRSDFileSerializer.cpp
-  src/data/VGearsSerializer.cpp
-  src/data/VGearsTexCodec.cpp
-  src/data/VGearsTexFile.cpp
-  src/data/VGearsTriggersFile.cpp
-  src/data/VGearsMapListFile.cpp
-  src/data/FinalFantasy7/FF7ModelListFile.cpp
-  src/data/FinalFantasy7/FF7ModelListFileManager.cpp
-  src/data/FinalFantasy7/FF7ModelListFileSerializer.cpp
+    src/common/VGearsApplication.cpp
+    src/data/VGearsAFile.cpp
+    src/data/VGearsAFileManager.cpp
+    src/data/VGearsAFileSerializer.cpp
+    src/data/worldmap/MapFile.cpp
+    src/data/worldmap/MapFileManager.cpp
+    src/data/worldmap/MapFileSerializer.cpp
+    src/data/worldmap/TxzFile.cpp
+    src/data/worldmap/TxzFileManager.cpp
+    src/data/worldmap/TxzFileSerializer.cpp
+    src/data/VGearsBackgroundFile.cpp
+    src/data/VGearsBackgroundFileManager.cpp
+    src/data/VGearsBackgroundFileSerializer.cpp
+    src/data/VGearsBackgroundTextureLoader.cpp
+    src/data/VGearsCameraMatrixFile.cpp
+    src/data/VGearsCameraMatrixFileManager.cpp
+    src/data/VGearsCameraMatrixFileSerializer.cpp
+    src/data/VGearsFLevelBackground2DLoader.cpp
+    src/data/VGearsFLevelFile.cpp
+    src/data/VGearsFLevelFileManager.cpp
+    src/data/VGearsFLevelFileSerializer.cpp
+    src/data/VGearsFLevelTextureLoader.cpp
+    src/data/VGearsHRCFile.cpp
+    src/data/VGearsHRCFileManager.cpp
+    src/data/VGearsHRCFileSerializer.cpp
+    src/data/VGearsHRCMeshLoader.cpp
+    src/data/VGearsHRCSkeletonLoader.cpp
+    src/data/VGearsLGPArchive.cpp
+    src/data/VGearsLGPArchiveFactory.cpp
+    src/data/VGearsLGPArchiveSerializer.cpp
+    src/data/VGearsLZSDataStream.cpp
+    src/data/VGearsLZSFLevelFile.cpp
+    src/data/VGearsLZSFLevelFileManager.cpp
+    src/data/VGearsPaletteFile.cpp
+    src/data/VGearsPaletteFileManager.cpp
+    src/data/VGearsPaletteFileSerializer.cpp
+    src/data/VGearsPFile.cpp
+    src/data/VGearsPFileManager.cpp
+    src/data/VGearsPFileSerializer.cpp
+    src/data/VGearsRSDFile.cpp
+    src/data/VGearsRSDFileManager.cpp
+    src/data/VGearsRSDFileSerializer.cpp
+    src/data/VGearsSerializer.cpp
+    src/data/VGearsTexCodec.cpp
+    src/data/VGearsTexFile.cpp
+    src/data/VGearsTriggersFile.cpp
+    src/data/VGearsMapListFile.cpp
+    src/data/FinalFantasy7/FF7ModelListFile.cpp
+    src/data/FinalFantasy7/FF7ModelListFileManager.cpp
+    src/data/FinalFantasy7/FF7ModelListFileSerializer.cpp
 )
 
 set(SOURCE_FILES
-  src/modules/worldmap/WorldMapModule.cpp
-
-  src/common/VGearsManualObject.cpp
-  src/common/VGearsResource.cpp
-  src/common/VGearsStringUtil.cpp
-  src/common/TypeDefine.cpp
-  src/common/LzsFile.cpp
-  src/common/File.cpp
-  src/common/FileSystem.cpp
-  src/core/particles/emitters/ParticlePointEmitter.cpp
-  src/core/particles/Particle.cpp
-  src/core/particles/ParticleEmitter.cpp
-  src/core/particles/ParticleEmitterDictionary.cpp
-  src/core/particles/ParticleEmitterTranslator.cpp
-  src/core/particles/ParticleRenderer.cpp
-  src/core/particles/ParticleRendererTranslator.cpp
-  src/core/particles/ParticleSystem.cpp
-  src/core/particles/ParticleSystemFactory.cpp
-  src/core/particles/ParticleSystemManager.cpp
-  src/core/particles/ParticleSystemTranslator.cpp
-  src/core/particles/ParticleSystemTranslatorManager.cpp
-  src/core/particles/ParticleTechnique.cpp
-  src/core/particles/ParticleTechniqueTranslator.cpp
-  src/core/particles/ParticleVisual.cpp
-  src/core/particles/renderer/ParticleEntityRenderer.cpp
-  src/core/particles/renderer/ParticleEntityRendererDictionary.cpp
-  src/core/Background2D.cpp
-  src/core/Background2DAnimation.cpp
-  src/core/CameraManager.cpp
-  src/core/ConfigCmd.cpp
-  src/core/ConfigCmdManager.cpp
-  src/core/ConfigFile.cpp
-  src/core/ConfigVar.cpp
-  src/core/ConfigVarManager.cpp
-  src/core/Console.cpp
-  src/core/DebugDraw.cpp
-  src/core/Entity.cpp
-  src/core/EntityCollision.cpp
-  src/core/EntityDirection.cpp
-  src/core/EntityManager.cpp
-  src/core/EntityModel.cpp
-  src/core/EntityPoint.cpp
-  src/core/EntityTrigger.cpp
-  src/core/GameFrameListener.cpp
-  src/core/InputManager.cpp
-  src/core/ScriptManager.cpp
-  src/core/Timer.cpp
-  src/core/UiAnimation.cpp
-  src/core/UiFont.cpp
-  src/core/UiManager.cpp
-  src/core/UiSprite.cpp
-  src/core/UiTextArea.cpp
-  src/core/UiWidget.cpp
-  src/core/Utilites.cpp
-  src/core/Walkmesh.cpp
-  src/core/XmlBackground2DFile.cpp
-  src/core/XmlFile.cpp
-  src/core/XmlFontFile.cpp
-  src/core/XmlFontsFile.cpp
-  src/core/XmlMapFile.cpp
-  src/core/XmlMapsFile.cpp
-  src/core/XmlPrototypesFile.cpp
-  src/core/XmlScreenFile.cpp
-  src/core/XmlScreensFile.cpp
-  src/core/XmlScriptsFile.cpp
-  src/core/XmlTextFile.cpp
-  src/core/XmlTextsFile.cpp
-  src/core/DialogsManager.cpp
-  src/core/TextManager.cpp
-  src/map/VGearsBackground2DFile.cpp
-  src/map/VGearsBackground2DFileManager.cpp
-  src/map/VGearsBackground2DFileXMLSerializer.cpp
-  src/map/VGearsMapFile.cpp
-  src/map/VGearsMapFileManager.cpp
-  src/map/VGearsMapFileXMLSerializer.cpp
-  src/map/VGearsWalkmeshFile.cpp
-  src/map/VGearsWalkmeshFileManager.cpp
-  src/map/VGearsWalkmeshFileXMLSerializer.cpp
-  #src/viewer/ViewerModule.cpp
-  src/VGearsGameState.cpp
-  src/data/VGearsXMLSerializer.cpp
-  src/common/FinalFantasy7/FF7NameLookup.cpp
-  src/map/FinalFantasy7/FF7WalkmeshFileSerializer.cpp
-  src/FF7Character.cpp
-  src/FF7Common.cpp
+    src/modules/worldmap/WorldMapModule.cpp
+    src/common/VGearsManualObject.cpp
+    src/common/VGearsResource.cpp
+    src/common/VGearsStringUtil.cpp
+    src/common/TypeDefine.cpp
+    src/common/LzsFile.cpp
+    src/common/File.cpp
+    src/common/FileSystem.cpp
+    src/core/particles/emitters/ParticlePointEmitter.cpp
+    src/core/particles/Particle.cpp
+    src/core/particles/ParticleEmitter.cpp
+    src/core/particles/ParticleEmitterDictionary.cpp
+    src/core/particles/ParticleEmitterTranslator.cpp
+    src/core/particles/ParticleRenderer.cpp
+    src/core/particles/ParticleRendererTranslator.cpp
+    src/core/particles/ParticleSystem.cpp
+    src/core/particles/ParticleSystemFactory.cpp
+    src/core/particles/ParticleSystemManager.cpp
+    src/core/particles/ParticleSystemTranslator.cpp
+    src/core/particles/ParticleSystemTranslatorManager.cpp
+    src/core/particles/ParticleTechnique.cpp
+    src/core/particles/ParticleTechniqueTranslator.cpp
+    src/core/particles/ParticleVisual.cpp
+    src/core/particles/renderer/ParticleEntityRenderer.cpp
+    src/core/particles/renderer/ParticleEntityRendererDictionary.cpp
+    src/core/Background2D.cpp
+    src/core/Background2DAnimation.cpp
+    src/core/CameraManager.cpp
+    src/core/ConfigCmd.cpp
+    src/core/ConfigCmdManager.cpp
+    src/core/ConfigFile.cpp
+    src/core/ConfigVar.cpp
+    src/core/ConfigVarManager.cpp
+    src/core/Console.cpp
+    src/core/DebugDraw.cpp
+    src/core/Entity.cpp
+    src/core/EntityCollision.cpp
+    src/core/EntityDirection.cpp
+    src/core/EntityManager.cpp
+    src/core/EntityModel.cpp
+    src/core/EntityPoint.cpp
+    src/core/EntityTrigger.cpp
+    src/core/GameFrameListener.cpp
+    src/core/InputManager.cpp
+    src/core/ScriptManager.cpp
+    src/core/Timer.cpp
+    src/core/UiAnimation.cpp
+    src/core/UiFont.cpp
+    src/core/UiManager.cpp
+    src/core/UiSprite.cpp
+    src/core/UiTextArea.cpp
+    src/core/UiWidget.cpp
+    src/core/Utilites.cpp
+    src/core/Walkmesh.cpp
+    src/core/XmlBackground2DFile.cpp
+    src/core/XmlFile.cpp
+    src/core/XmlFontFile.cpp
+    src/core/XmlFontsFile.cpp
+    src/core/XmlMapFile.cpp
+    src/core/XmlMapsFile.cpp
+    src/core/XmlPrototypesFile.cpp
+    src/core/XmlScreenFile.cpp
+    src/core/XmlScreensFile.cpp
+    src/core/XmlScriptsFile.cpp
+    src/core/XmlTextFile.cpp
+    src/core/XmlTextsFile.cpp
+    src/core/DialogsManager.cpp
+    src/core/TextManager.cpp
+    src/map/VGearsBackground2DFile.cpp
+    src/map/VGearsBackground2DFileManager.cpp
+    src/map/VGearsBackground2DFileXMLSerializer.cpp
+    src/map/VGearsMapFile.cpp
+    src/map/VGearsMapFileManager.cpp
+    src/map/VGearsMapFileXMLSerializer.cpp
+    src/map/VGearsWalkmeshFile.cpp
+    src/map/VGearsWalkmeshFileManager.cpp
+    src/map/VGearsWalkmeshFileXMLSerializer.cpp
+    #src/viewer/ViewerModule.cpp
+    src/VGearsGameState.cpp
+    src/data/VGearsXMLSerializer.cpp
+    src/common/FinalFantasy7/FF7NameLookup.cpp
+    src/map/FinalFantasy7/FF7WalkmeshFileSerializer.cpp
+    src/FF7Character.cpp
+    src/FF7Common.cpp
 )
+
+# If sound, add more files.
 if(VGears_SOUND)
     set(HEADER_FILES
         ${HEADER_FILES}
@@ -316,55 +314,49 @@ if(VGears_SOUND)
     )
 endif()
 
+# Find LibOIS. TODO: Find it.
 set(ois_lib "/usr/lib/x86_64-linux-gnu/libOIS.so")
 
-#set(luabind_lib "/usr/lib/x86_64-linux-gnu/libluabind.a")
-#set(luabind_lib "${VGears_SOURCE_DIR}/lib/libluabind.a")
-#set(luabind_lib "/usr/lib/x86_64-linux-gnu/libluabind.so.0.9.1d1")
-#set(lua_lib "/usr/lib/x86_64-linux-gnu/liblua5.1.so.0")
-
+# TODO: Find OIS
 include_directories(
     ${VGears_INCLUDE_DIRS}
     ${CMAKE_CURRENT_SOURCE_DIR}/include
-
-    # TODO: remove dependency on ff7 related code
-    #${VGears_SOURCE_DIR}/SupportedGames/FinalFantasy7/include
-    #${CMAKE_CURRENT_SOURCE_DIR}/SupportedGames/FinalFantasy7/include
     /usr/include/OIS/
 
 )
 
-#compiler options
+# Compiler options
 if (MSVC)
 else()
-if(WIN32)
-    add_definitions(
-      -W
-      -mthreads
-      -fmessage-length=0
-      -fexceptions
-      -fident
-    )
-
-    #linker options
-    add_definitions(
-      -Wl,--enable-runtime-pseudo-reloc
-      -Wl,--enable-auto-image-base
-      -Wl,--add-stdcall-alias
-    )
-endif()
+    if(WIN32)
+        add_definitions(
+            -W
+            -mthreads
+            -fmessage-length=0
+            -fexceptions
+            -fident
+        )
+    
+        # Linker options
+        add_definitions(
+            -Wl,--enable-runtime-pseudo-reloc
+            -Wl,--enable-auto-image-base
+            -Wl,--add-stdcall-alias
+        )
+    endif()
 endif()
 
-#defines
+# Defines.
 if(WIN32)
-  #check usage and remove if uneccessary
-  add_definitions(-DWIN32 -D__WIN32__ -D_WINDOWS)
+    # Check usage and remove if uneccessary
+    add_definitions(-DWIN32 -D__WIN32__ -D_WINDOWS)
 endif()
 
+# TODO: Find OIS
 add_library(V-Gears STATIC
-  ${HEADER_FILES}
-  ${SOURCE_FILES}
-  /usr/include/OIS/
+    ${HEADER_FILES}
+    ${SOURCE_FILES}
+    /usr/include/OIS/
 )
 
 # Coverage uses more memory, combined with PCH can cause OOM/ICE
@@ -374,64 +366,54 @@ cotire(V-Gears)
 SET_PROPERTY(TARGET V-Gears PROPERTY FOLDER "v-gears")
 
 add_library(v-gears-data STATIC
- ${HEADER_FILES_DATA}
- ${SOURCE_FILES_DATA}
- )
+    ${HEADER_FILES_DATA}
+    ${SOURCE_FILES_DATA}
+)
 add_dependencies(v-gears-data configure_vgears_version)
 # Coverage uses more memory, combined with PCH can cause OOM/ICE
 if ($ENV{COVERAGE}!=1)
-cotire(v-gears-data)
+    cotire(v-gears-data)
 endif()
 SET_PROPERTY(TARGET v-gears-data PROPERTY FOLDER "v-gears")
 
-
-add_executable(v-gears
-  src/Main.cpp
-)
+add_executable(v-gears src/Main.cpp)
 SET_PROPERTY(TARGET v-gears PROPERTY FOLDER "v-gears")
 set(CPACK_PACKAGE_EXECUTABLES v-gears "v-gears")
 set(CPACK_WIX_PROGRAM_MENU_FOLDER "VGears")
 
 if (APPLE)
-target_link_libraries(v-gears "-framework CoreFoundation -framework Cocoa -framework IOKit" ${ois_lib})
+    target_link_libraries(v-gears "-framework CoreFoundation -framework Cocoa -framework IOKit" ${ois_lib})
 endif()
 
 if( WIN32 AND NOT (CMAKE_BUILD_TYPE MATCHES "Debug") )
     set_target_properties( v-gears PROPERTIES WIN32_EXECUTABLE ON )
-	if (MSVC)
+    if (MSVC)
         set_target_properties(v-gears PROPERTIES LINK_FLAGS "/SUBSYSTEM:CONSOLE")
     endif()
 endif()
 
 target_link_libraries(V-Gears 
     ${VGears_LIBRARIES}
-    #lua5.2
     LuaBind
     liblua
     tinyxml
-    #FinalFantasy7
     ${ois_lib}
-    #${lua_lib}
-    #${luabind_lib}
 )
 
 target_link_libraries(v-gears 
-	V-Gears
-	${Boost_LIBRARIES}
+    V-Gears
+    ${Boost_LIBRARIES}
     v-gears-data
     ${ois_lib}
-    #${luabind_lib}
-    #luabind
 )
 
 target_link_libraries(v-gears-data
     V-Gears
     ${ois_lib}
-    #${luabind_lib}
 )
 
 if(WIN32 OR APPLE)
-  install(TARGETS v-gears DESTINATION .)
+    install(TARGETS v-gears DESTINATION .)
 else()
-  install(TARGETS v-gears RUNTIME DESTINATION ./games)
-endif()
+    install(TARGETS v-gears RUNTIME DESTINATION ./games)
+endif()

lib/CMakeLists.txt

@@ -1,21 +1,15 @@
 include_directories(
     ${VGears_INCLUDE_DIRS}
-	luabind
-	luajit/src
-	luabind/luabind
-	luabind/luabind/detail
-	#SUDM
+    luabind
+    luajit/src
+    luabind/luabind
+    luabind/luabind/detail
 )
 
-#add_subdirectory(tinyxml)
+# LuaJIT has it's own configuration.
 add_subdirectory(luajit)
 
-SET(SUDM_AS_LIB TRUE CACHE BOOL "Build only lib")
-#add_subdirectory(SUDM)
-
- aux_source_directory( luabind/luabind LuaBind_header_FILES )
- aux_source_directory( luabind/luabind/details LuaBind_header_details_FILES )
- aux_source_directory( luabind/src LuaBind_src_FILES )
- add_library(LuaBind STATIC ${LuaBind_src_FILES} ${LuaBind_header_FILES} ${LuaBind_header_details_FILES})
- 
- 
+aux_source_directory(luabind/luabind LuaBind_header_FILES)
+aux_source_directory(luabind/luabind/details LuaBind_header_details_FILES)
+aux_source_directory(luabind/src LuaBind_src_FILES)
+add_library(LuaBind STATIC ${LuaBind_src_FILES} ${LuaBind_header_FILES} ${LuaBind_header_details_FILES})