Clean CMake files.

Tools/CMake/libraries/collada.cmake

@@ -6,8 +6,6 @@ addPath("${libDir}/collada/src/modules/LIBXMLPlugin")
 addPath("${libDir}/collada/src/modules/stdErrPlugin")
 addPath("${libDir}/collada/src/modules/STLDatabase")
 
-addStaticLib()
-
 addDef(DOM_INCLUDE_TINYXML)
 addDef(PCRE_STATIC)
 
@@ -15,3 +13,5 @@ addInclude(${libDir}/collada/include)
 addInclude(${libDir}/collada/include/1.4)
 addInclude(${libDir}/pcre)
 addInclude(${libDir}/tinyxml)
+
+finishLibrary()

Tools/CMake/libraries/convexDecomp.cmake

@@ -1,3 +1,3 @@
 project(convexDecomp)
 
-addStaticLib("${libDir}/convexDecomp")
+finishLibrary("${libDir}/convexDecomp")

Tools/CMake/libraries/libogg.cmake

@@ -1,7 +1,7 @@
 project(libogg)
 
-addPathRec("${libDir}/libogg")
-
-addStaticLib()
+addPath("${libDir}/libogg" REC)
 
 addInclude(${libDir}/libogg/include)
+
+finishLibrary()

Tools/CMake/libraries/libtheora.cmake

@@ -2,9 +2,9 @@ project(libtheora)
 
 addPathRec("${libDir}/libtheora")
 
-addStaticLib()
-
 addDef(TORQUE_OGGTHEORA)
 addDef(TORQUE_OGGVORIBS)
 addInclude(${libDir}/libogg/include)
 addInclude(${libDir}/libtheora/include)
+
+finishLibrary()

Tools/CMake/libraries/libvorbis.cmake

@@ -2,8 +2,8 @@ project(libvorbis)
 
 addPathRec("${libDir}/libvorbis")
 
-addStaticLib()
-
 addDef(TORQUE_OGGVORBIS)
 addInclude(${libDir}/libvorbis/include)
 addInclude(${libDir}/libogg/include)
+
+finishLibrary()

Tools/CMake/libraries/ljpeg.cmake

@@ -1,3 +1,3 @@
 project(ljpeg)
 
-addStaticLib("${libDir}/ljpeg")
+finishLibrary("${libDir}/ljpeg")

Tools/CMake/libraries/lmng.cmake

@@ -1,9 +1,10 @@
 project(lmng)
 
-addStaticLib("${libDir}/${PROJECT_NAME}")
 
 addDef(MNG_OPTIMIZE_OBJCLEANUP)
 
 addInclude(${libDir}/lpng)
 addInclude(${libDir}/zlib)
 addInclude(${libDir}/ljpeg)
+
+finishLibrary("${libDir}/${PROJECT_NAME}")

Tools/CMake/libraries/lpng.cmake

@@ -1,7 +1,7 @@
 project(lpng)
 
-addStaticLib("${libDir}/${PROJECT_NAME}")
-
 # addDef(PNG_NO_ASSEMBLER_CODE)
 
 addInclude(${libDir}/zlib)
+
+finishLibrary("${libDir}/${PROJECT_NAME}")

Tools/CMake/libraries/lungif.cmake

@@ -1,5 +1,6 @@
 project(lungif)
 
-addStaticLib("${libDir}/${PROJECT_NAME}")
-
 addDef(_GBA_NO_FILEIO)
+
+
+finishLibrary("${libDir}/${PROJECT_NAME}")

Tools/CMake/libraries/opcode.cmake

@@ -3,7 +3,7 @@ project(opcode)
 addPath("${libDir}/${PROJECT_NAME}")
 addPath("${libDir}/${PROJECT_NAME}/Ice")
 
-addStaticLib()
-
 addDef(TORQUE_OPCODE)
 addDef(ICE_NO_DLL)
+
+finishLibrary()

Tools/CMake/libraries/pcre.cmake

@@ -1,8 +1,10 @@
 project(pcre)
 
-addStaticLib("${libDir}/pcre")
-
 addDef(PCRE_STATIC)
 addDef(HAVE_CONFIG_H)
 
-set_property(TARGET pcre PROPERTY COMPILE_FLAGS       /TP) #/TP = compile as C++
+finishLibrary("${libDir}/pcre")
+
+if(WIN32)
+    set_property(TARGET pcre PROPERTY COMPILE_FLAGS /TP) #/TP = compile as C++
+endif()

Tools/CMake/libraries/recast.cmake

@@ -9,10 +9,10 @@ addPathRec( "${libDir}/recast/DetourCrowd/Source" )
 addPathRec( "${libDir}/recast/DetourTileCache/Source" )
 
 # Additional includes
-include_directories( "${libDir}/recast/DebugUtils/Include" )
-include_directories( "${libDir}/recast/Recast/Include" )
-include_directories( "${libDir}/recast/Detour/Include" )
-include_directories( "${libDir}/recast/DetourTileCache/Include" )
-include_directories( "${libDir}/recast/DetourCrowd/Include" )
+addInclude( "${libDir}/recast/DebugUtils/Include" )
+addInclude( "${libDir}/recast/Recast/Include" )
+addInclude( "${libDir}/recast/Detour/Include" )
+addInclude( "${libDir}/recast/DetourTileCache/Include" )
+addInclude( "${libDir}/recast/DetourCrowd/Include" )
 
-addStaticLib()
+finishLibrary()

Tools/CMake/libraries/squish.cmake

@@ -1,3 +1,3 @@
 project(squish)
 
-addStaticLib("${libDir}/${PROJECT_NAME}")
+finishLibrary("${libDir}/${PROJECT_NAME}")

Tools/CMake/libraries/tinyxml.cmake

@@ -1,3 +1,3 @@
 project(tinyxml)
 
-addStaticLib("${libDir}/${PROJECT_NAME}")
+finishLibrary("${libDir}/${PROJECT_NAME}")

Tools/CMake/libraries/zlib.cmake

@@ -1,3 +1,3 @@
 project(zlib)
 
-addStaticLib("${libDir}/${PROJECT_NAME}")
+finishLibrary("${libDir}/${PROJECT_NAME}")