Core/Collision: Edit source files to represent the recent changes in the extractors (v4.00 2012_02) to avoid confusion with old extractors (v3.00 2010_07)

src/tools/CMakeLists.txt

@@ -9,5 +9,5 @@
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 add_subdirectory(map_extractor)
-add_subdirectory(vmap3_assembler)
+add_subdirectory(vmap4_assembler)
-add_subdirectory(vmap3_extractor)
+add_subdirectory(vmap4_extractor)

src/tools/vmap4_assembler/CMakeLists.txt

@@ -21,21 +21,21 @@ include_directories(
 )
 
 add_definitions(-DNO_CORE_FUNCS)
-add_executable(vmap3assembler VMapAssembler.cpp)
+add_executable(vmap4assembler VMapAssembler.cpp)
-add_dependencies(vmap3assembler mpq)
+add_dependencies(vmap4assembler mpq)
 
 if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
-  set_target_properties(vmap3assembler PROPERTIES LINK_FLAGS "-framework Carbon")
+  set_target_properties(vmap4assembler PROPERTIES LINK_FLAGS "-framework Carbon")
 endif()
 
-target_link_libraries(vmap3assembler
+target_link_libraries(vmap4assembler
   collision
   g3dlib
   ${ZLIB_LIBRARIES}
 )
 
 if( UNIX )
-  install(TARGETS vmap3assembler DESTINATION bin)
+  install(TARGETS vmap4assembler DESTINATION bin)
 elseif( WIN32 )
-  install(TARGETS vmap3assembler DESTINATION "${CMAKE_INSTALL_PREFIX}")
+  install(TARGETS vmap4assembler DESTINATION "${CMAKE_INSTALL_PREFIX}")
 endif()

src/tools/vmap4_extractor/CMakeLists.txt

@@ -31,18 +31,18 @@ elseif( WIN32 )
   )
 endif()
 
-add_executable(vmap3extractor ${sources})
+add_executable(vmap4extractor ${sources})
 
-target_link_libraries(vmap3extractor
+target_link_libraries(vmap4extractor
   ${BZIP2_LIBRARIES}
   ${ZLIB_LIBRARIES}
   mpq
 )
 
-add_dependencies(vmap3extractor mpq)
+add_dependencies(vmap4extractor mpq)
 
 if( UNIX )
-  install(TARGETS vmap3extractor DESTINATION bin)
+  install(TARGETS vmap4extractor DESTINATION bin)
 elseif( WIN32 )
-  install(TARGETS vmap3extractor DESTINATION "${CMAKE_INSTALL_PREFIX}")
+  install(TARGETS vmap4extractor DESTINATION "${CMAKE_INSTALL_PREFIX}")
 endif()

src/tools/vmap4_extractor/vmapexport.cpp

@@ -457,7 +457,7 @@ bool processArgv(int argc, char ** argv, const char *versionString)
 int main(int argc, char ** argv)
 {
     bool success=true;
-    const char *versionString = "V3.00 2010_07";
+    const char *versionString = "V4.00 2012_02";
 
     // Use command line arguments, when some
     if(!processArgv(argc, argv, versionString))