improved config format, eaiser to be used now

Tools/CMake/basics.cmake

@@ -15,62 +15,123 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${projectOutDir}/bin)
 
 SET(CMAKE_INSTALL_PREFIX "${projectOutDir}" CACHE INTERNAL "Prefix prepended to install directories" FORCE)
 
+# finds and adds sources files in a folder
+macro(addPath dir)
+    set(tmpa "")
+    file(GLOB tmpa
+             ${dir}/*.cpp
+             ${dir}/*.c
+             ${dir}/*.cc
+             ${dir}/*.h)
+    LIST(APPEND ${PROJECT_NAME}_files "${tmpa}")
+    LIST(APPEND ${PROJECT_NAME}_paths "${dir}")
+    #set(t "${${t}};${tmpa}")
+endmacro()
+
+# adds a file to the sources
+macro(addFile filename)
+    LIST(APPEND ${PROJECT_NAME}_files "${filename}")
+endmacro()
 
-function(addLibPath varname dir mode)
+# finds and adds sources files in a folder recursively
+macro(addPathRec dir)
     set(tmpa "")
-    file(${mode} tmpa
+    file(GLOB_RECURSE tmpa
              ${dir}/*.cpp
              ${dir}/*.c
              ${dir}/*.cc
              ${dir}/*.h)
-    set("${varname}" "${${varname}};${tmpa}" PARENT_SCOPE)
-endfunction()
+    LIST(APPEND ${PROJECT_NAME}_files "${tmpa}")
+    LIST(APPEND ${PROJECT_NAME}_paths "${dir}")
+endmacro()
 
-function(addLibraryFinal paths libName relDir)
-    foreach(f ${paths})
-        # Get the path of the file relative to ${DIRECTORY},
-        # then alter it (not compulsory)
-        file(RELATIVE_PATH SRCGR ${relDir} ${f})
-        set(SRCGR "${libName}/${SRCGR}")            
-        # Extract the folder, ie remove the filename part
-        string(REGEX REPLACE "(.*)(/[^/]*)$" "\\1" SRCGR ${SRCGR})
-        # Source_group expects \\ (double antislash), not / (slash)
-        string(REPLACE / \\ SRCGR ${SRCGR})
-        source_group("${SRCGR}" FILES ${f})
-    endforeach()
-    add_library("${libName}" STATIC ${paths})
-endfunction()
+# adds a definition
+macro(addDef def)
+    set_property(TARGET ${PROJECT_NAME} APPEND PROPERTY COMPILE_DEFINITIONS "${def}")
+endmacro()
+
+# adds an include path
+macro(addInclude incPath)
+    #message(STATUS "${PROJECT_NAME} : add include path : ${incPath}")
+    set_property(TARGET ${PROJECT_NAME} APPEND PROPERTY INCLUDE_DIRECTORIES "${incPath}")
+endmacro()
+
+# adds a library to link against
+macro(addLib lib)
+    #message(STATUS "${PROJECT_NAME} : add lib : ${lib}")
+    target_link_libraries(${PROJECT_NAME} "${lib}")
+endmacro()
+
+# adds a path to search for libs
+macro(addLibPath dir)
+    link_directories(${dir})
+endmacro()
 
-function(addExecutableFinal paths exeName relDir)
-    foreach(f ${paths})
+# creates a proper filter for VS
+macro(generateFilters relDir)
+    foreach(f ${${PROJECT_NAME}_files})
         # Get the path of the file relative to ${DIRECTORY},
         # then alter it (not compulsory)
         file(RELATIVE_PATH SRCGR ${relDir} ${f})
-        set(SRCGR "${exeName}/${SRCGR}")            
+        set(SRCGR "${PROJECT_NAME}/${SRCGR}")            
         # Extract the folder, ie remove the filename part
         string(REGEX REPLACE "(.*)(/[^/]*)$" "\\1" SRCGR ${SRCGR})
+        # do not have any ../ dirs
+        string(REPLACE "../" "" SRCGR ${SRCGR})
         # Source_group expects \\ (double antislash), not / (slash)
         string(REPLACE / \\ SRCGR ${SRCGR})
+        #STRING(REPLACE "//" "/" SRCGR ${SRCGR})
+        #message(STATUS "FILE: ${f} -> ${SRCGR}")
         source_group("${SRCGR}" FILES ${f})
     endforeach()
-    add_executable("${exeName}" WIN32 ${paths})
-endfunction()
+endmacro()
 
-function(addLibrary dirs libName mode)
-    set(tmp "")
+# macro to add a static library
+macro(addStaticLib)
+    # more paths?
+    if(${ARGC} GREATER 0)
+        foreach(dir ${ARGV0})
+            addPath("${dir}")
+        endforeach()
+    endif()
+    # now inspect the paths we got
     set(firstDir "")
-    #message(STATUS "${libName}")
-    foreach(dir ${dirs})
+    foreach(dir ${${PROJECT_NAME}_paths})
         if("${firstDir}" STREQUAL "")
             set(firstDir "${dir}")
         endif()
-        addLibPath(tmp "${dir}" ${mode})
     endforeach()
-    addLibraryFinal("${tmp}" "${libName}" "${firstDir}")
-    foreach(dir ${dirs})
-        set_property(TARGET "${libName}" PROPERTY INCLUDE_DIRECTORIES "${dir}")
+    generateFilters("${firstDir}")
+    add_library("${PROJECT_NAME}" STATIC ${${PROJECT_NAME}_files})
+    # omg - only use the first folder ... otehrwise we get lots of header name collisions
+    #foreach(dir ${${PROJECT_NAME}_paths})
+    addInclude("${firstDir}")
+    #endforeach()
+endmacro()
+
+# macro to add an executable
+macro(addExecutable)
+    # more paths?
+    if(${ARGC} GREATER 0)
+        foreach(dir ${ARGV0})
+            addPath("${dir}")
+        endforeach()
+    endif()
+    # now inspect the paths we got
+    set(firstDir "")
+    foreach(dir ${${PROJECT_NAME}_paths})
+        if("${firstDir}" STREQUAL "")
+            set(firstDir "${dir}")
+        endif()
     endforeach()
-endfunction()
+    generateFilters("${firstDir}")
+    add_executable("${PROJECT_NAME}" WIN32 ${${PROJECT_NAME}_files})
+    # omg - only use the first folder ... otehrwise we get lots of header name collisions
+    #foreach(dir ${${PROJECT_NAME}_paths})
+    addInclude("${firstDir}")
+    #endforeach()
+endmacro()
+
 
 if(WIN32)
     # default disabled warnings: 4018;4100;4121;4127;4130;4244;4245;4389;4511;4512;4800;

Tools/CMake/collada.cmake

@@ -1,6 +1,17 @@
 project(collada)
 
-addLibrary("${libDir}/collada/src/1.4/dom;${libDir}/collada/src/dae;${libDir}/collada/src/modules/LIBXMLPlugin;${libDir}/collada/src/modules/stdErrPlugin;${libDir}/collada/src/modules/STLDatabase" collada GLOB)
+addPath("${libDir}/collada/src/1.4/dom")
+addPath("${libDir}/collada/src/dae")
+addPath("${libDir}/collada/src/modules/LIBXMLPlugin")
+addPath("${libDir}/collada/src/modules/stdErrPlugin")
+addPath("${libDir}/collada/src/modules/STLDatabase")
 
-set_property(TARGET collada PROPERTY COMPILE_DEFINITIONS DOM_INCLUDE_TINYXML PCRE_STATIC)
-set_property(TARGET collada PROPERTY INCLUDE_DIRECTORIES ${libDir}/collada/include ${libDir}/collada/include/1.4 ${libDir}/pcre ${libDir}/tinyxml)
+addStaticLib()
+
+addDef(DOM_INCLUDE_TINYXML)
+addDef(PCRE_STATIC)
+
+addInclude(${libDir}/collada/include)
+addInclude(${libDir}/collada/include/1.4)
+addInclude(${libDir}/pcre)
+addInclude(${libDir}/tinyxml)

Tools/CMake/convexDecomp.cmake

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

Tools/CMake/libogg.cmake

@@ -1,5 +1,7 @@
 project(libogg)
 
-addLibrary("${libDir}/libogg" libogg GLOB_RECURSE)
+addPathRec("${libDir}/libogg")
 
-set_property(TARGET libogg PROPERTY INCLUDE_DIRECTORIES ${libDir}/libogg/include )
+addStaticLib()
+
+addInclude(${libDir}/libogg/include)

Tools/CMake/libtheora.cmake

@@ -1,6 +1,10 @@
 project(libtheora)
 
-addLibrary("${libDir}/libtheora" libtheora GLOB_RECURSE)
+addPathRec("${libDir}/libtheora")
 
-set_property(TARGET libtheora PROPERTY COMPILE_DEFINITIONS TORQUE_OGGTHEORA TORQUE_OGGVORIBS)
-set_property(TARGET libtheora PROPERTY INCLUDE_DIRECTORIES ${libDir}/libtheora/include ${libDir}/libogg/include)
+addStaticLib()
+
+addDef(TORQUE_OGGTHEORA)
+addDef(TORQUE_OGGVORIBS)
+addInclude(${libDir}/libogg/include)
+addInclude(${libDir}/libtheora/include)

Tools/CMake/libvorbis.cmake

@@ -1,6 +1,9 @@
 project(libvorbis)
 
-addLibrary("${libDir}/libvorbis" libvorbis GLOB_RECURSE)
+addPathRec("${libDir}/libvorbis")
 
-set_property(TARGET libvorbis PROPERTY COMPILE_DEFINITIONS TORQUE_OGGVORBIS)
-set_property(TARGET libvorbis PROPERTY INCLUDE_DIRECTORIES ${libDir}/libvorbis/include ${libDir}/libogg/include )
+addStaticLib()
+
+addDef(TORQUE_OGGVORBIS)
+addInclude(${libDir}/libvorbis/include)
+addInclude(${libDir}/libogg/include)

Tools/CMake/ljpeg.cmake

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

Tools/CMake/lmng.cmake

@@ -1,6 +1,9 @@
 project(lmng)
 
-addLibrary("${libDir}/lmng" lmng GLOB)
+addStaticLib("${libDir}/${PROJECT_NAME}")
 
-set_property(TARGET lmng PROPERTY COMPILE_DEFINITIONS MNG_OPTIMIZE_OBJCLEANUP)
-set_property(TARGET lmng PROPERTY INCLUDE_DIRECTORIES ${libDir}/lpng ${libDir}/zlib ${libDir}/ljpeg)
+addDef(MNG_OPTIMIZE_OBJCLEANUP)
+
+addInclude(${libDir}/lpng)
+addInclude(${libDir}/zlib)
+addInclude(${libDir}/ljpeg)

Tools/CMake/lpng.cmake

@@ -1,6 +1,7 @@
 project(lpng)
 
-addLibrary("${libDir}/lpng" lpng GLOB)
+addStaticLib("${libDir}/${PROJECT_NAME}")
 
-#set_property(TARGET lpng PROPERTY COMPILE_DEFINITIONS PNG_NO_ASSEMBLER_CODE)
-set_property(TARGET lpng PROPERTY INCLUDE_DIRECTORIES ${libDir}/zlib)
+# addDef(PNG_NO_ASSEMBLER_CODE)
+
+addInclude(${libDir}/zlib)

Tools/CMake/lungif.cmake

@@ -1,5 +1,5 @@
 project(lungif)
 
-addLibrary("${libDir}/lungif" lungif GLOB)
+addStaticLib("${libDir}/${PROJECT_NAME}")
 
-set_property(TARGET lungif PROPERTY COMPILE_DEFINITIONS _GBA_NO_FILEIO)
+addDef(_GBA_NO_FILEIO)

Tools/CMake/opcode.cmake

@@ -1,5 +1,9 @@
 project(opcode)
 
-addLibrary("${libDir}/opcode;${libDir}/opcode/Ice" opcode GLOB)
+addPath("${libDir}/${PROJECT_NAME}")
+addPath("${libDir}/${PROJECT_NAME}/Ice")
 
-set_property(TARGET opcode PROPERTY COMPILE_DEFINITIONS TORQUE_OPCODE ICE_NO_DLL)
+addStaticLib()
+
+addDef(TORQUE_OPCODE)
+addDef(ICE_NO_DLL)

Tools/CMake/pcre.cmake

@@ -1,7 +1,8 @@
 project(pcre)
 
-addLibrary("${libDir}/pcre" pcre GLOB)
+addStaticLib("${libDir}/pcre")
+
+addDef(PCRE_STATIC)
+addDef(HAVE_CONFIG_H)
 
-set_property(TARGET pcre PROPERTY COMPILE_DEFINITIONS PCRE_STATIC HAVE_CONFIG_H)
 set_property(TARGET pcre PROPERTY COMPILE_FLAGS       /TP) #/TP = compile as C++
-set_property(TARGET pcre PROPERTY INCLUDE_DIRECTORIES ${libDir}/pcre)

Tools/CMake/squish.cmake

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

Tools/CMake/tinyxml.cmake

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

Tools/CMake/torque3d.cmake

@@ -1,89 +1,22 @@
+project(torque3d)
+
 # TODO: fmod support
 
-# Prefs
-add_definitions(-DTORQUE_SHADERGEN)
-add_definitions(-DINITGUID)
-add_definitions(-DNTORQUE_SHARED)
-
-# flags found in the code:
-# TORQUE_TGB_ONLY
-# TORQUE_PLAYER
-# TORQUE_DEMO_PURCHASE
-# TORQUE_ENABLE_VFS
-# TORQUE_DEBUG
-# TORQUE_MINIDUMP
-# TORQUE_RELEASE
-# TORQUE_DEBUG_GUARD
-# _XBOX
-# TORQUE_OS_MAC
-# TORQUE_TOOLS
-# TORQUE_SHIPPING
-# TORQUE_DEBUG_NET
-# TORQUE_OS_LINUX
-# TORQUE_OS_OPENBSD
-# TORQUE_OS_XENON
-# TORQUE_OS_PS3
-# TORQUE_OS_MAC
-# TORQUE_OS_WIN32
-# TORQUE_ENGINE_PRODUCT
-# DEBUG_AST_NODES
-# TORQUE_ENABLE_SCRIPTASSERTS
-# TORQUE_NO_DSO_GENERATION
-# DOXYGENIZING
-# TORQUE2D_TOOLS_FIXME
-# DEBUG_SPEW
-# DISABLE_DEBUG_SPEW
-# TORQUE_NET_STATS
-# TORQUE_DEBUG_NET
-# TORQUE_LOCBUILD
-# USE_UNDOCUMENTED_GROUP
-# _PACK_BUG_WORKAROUNDS
-# PLATFORM_LITTLE_ENDIAN
-# TORQUE_BIG_ENDIAN
-# NO_BLUR
-# FRAMEALLOCATOR_DEBUG_GUARD
-# TORQUE_DEBUG_RES_MANAGER
-# TORQUE_ENABLE_UTF16_CACHE
-# TORQUE_ENABLE_THREAD_STATIC_METRICS
-# TORQUE_ENABLE_THREAD_STATICS
-# WANT_TO_SIMULATE_UI_ON_360
-# TORQUE_GATHER_METRICS
-# D3DXSHADER_USE_LEGACY_D3DX9_31_DLL
-# TORQUE_ENABLE_CSF_GENERATION
-# TORQUE_DEBUG_RENDER
-# TORQUE_ENABLE_PROFILER
-# TORQUE_ENABLE_PROFILE_PATH
-# DOXYGEN
-# TORQUE_COLLADA
-# TORQUE_COMPILER_GCC
-# LOG_INPUT
-# TORQUE_SUPPORTS_GCC_INLINE_X86_ASM
-# TORQUE_ENABLE_ASSERTS
-# DLL_CODE
-# TORQUE_USE_WINSOCK
-# TORQUE_DISABLE_PC_CONNECTIVITY
-# TORQUE_SUPPORTS_VC_INLINE_X86_ASM
-# TORQUE_64BITS
-# APSTUDIO_INVOKED
-# APSTUDIO_READONLY_SYMBOLS
-# INITGUID
-# LOG_MOUSEMOVE
-# TORQUE_COMPILER_MINGW
-# TORQUE_LIB
-# TORQUE_SHARED
-# TORQUE_DEDICATED
-# TORQUE_ENGINE
-# TORQUE_OGGVORBIS
-# TORQUE_EXTENDED_MOVE
-# DECALMANAGER_DEBUG
-# TORQUE_DEBUG_NET_MOVES
-# TORQUE_DEMO_WATERMARK
-# TORQUE_CPU_X86
-# USE_MEM_VERTEX_BUFFERS
-# TORQUE_MAX_LIB
-# TORQUE_ENABLE_SAMPLING
-#TORQUE_DISABLE_FIND_ROOT_WITHIN_ZIP
+###############################################################################
+# modules
+###############################################################################
+option(TORQUE_SFX_VORBIS "Vorbis Sound" ON)
+option(TORQUE_ADVANCED_LIGHTING "Advanced Lighting" ON)
+option(TORQUE_BASIC_LIGHTING "Basic Lighting" ON)
+option(TORQUE_THEORA "Theora Video Support" ON)
+option(TORQUE_SFX_DirectX "DirectX Sound" ON)
+option(TORQUE_SFX_OPENAL "OpenAL Sound" ON)
+option(TORQUE_HIFI "HIFI? support" OFF)
+option(TORQUE_EXTENDED_MOVE "Extended move support" OFF)
 
+###############################################################################
+# options
+###############################################################################
 option(TORQUE_MULTITHREAD "Multi Threading" ON)
 option(TORQUE_DISABLE_MEMORY_MANAGER "Disable memory manager" OFF)
 option(TORQUE_DISABLE_VIRTUAL_MOUNT_SYSTEM "Disable virtual mount system" OFF)
@@ -94,383 +27,362 @@ option(TORQUE_DEBUG "T3D Debug mode" OFF)
 option(TORQUE_SHIPPING "T3D Shipping build?" OFF)
 option(TORQUE_DEBUG_NET "debug network" OFF)
 option(TORQUE_DEBUG_NET_MOVES "debug network moves" OFF)
-#option(DEBUG_SPEW "more debug" OFF)
+option(TORQUE_ENABLE_ASSERTS "enables or disable asserts" OFF)
 
+#option(DEBUG_SPEW "more debug" OFF)
 set(TORQUE_APP_NAME "Default" CACHE STRING "the app name")
 set(TORQUE_APP_VERSION "1000" CACHE STRING "the app version: major * 1000 + minor * 100 + revision * 10.")
 set(TORQUE_APP_VERSION_STRING "1.0" CACHE STRING "the app version string")
-
-# MAXPACKETSIZE
-# TORQUE_GATHER_METRICS
-# TORQUE_DEBUG_GUARD
-# TORQUE_ENABLE_THREAD_STATICS
-# TORQUE_ENABLE_THREAD_STATIC_METRICS
-# FRAMEALLOCATOR_DEBUG_GUARD
-
 set(TORQUE_NO_DSO_GENERATION ON)
 
-
-add_definitions(-DUNICODE)
-add_definitions(-D_UNICODE) # for VS
-add_definitions(-DTORQUE_UNICODE)
-#add_definitions(-DTORQUE_SHARED)
-
-# for libTomCrypt
-add_definitions(-DLTC_NO_PROTOTYPES)
-
-
-add_definitions(-D_CRT_SECURE_NO_WARNINGS)
-add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
-
 # warning C4800: 'XXX' : forcing value to bool 'true' or 'false' (performance warning)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -wd4800")
-
 # warning C4018: '<' : signed/unsigned mismatch
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -wd4018")
-
 # warning C4244: 'initializing' : conversion from 'XXX' to 'XXX', possible loss of data
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -wd4244")
 
-include_directories(${projectSrcDir})
-include_directories(${srcDir}/)
-include_directories(${libDir}/lmpg)
-include_directories(${libDir}/lpng)
-include_directories(${libDir}/ljpeg)
-include_directories(${libDir}/lungif)
-include_directories(${libDir}/zlib)
-include_directories(${libDir}/) # for tinyxml
-include_directories(${libDir}/tinyxml)
-include_directories(${libDir}/squish)
-include_directories(${libDir}/convexDecomp)
-include_directories(${libDir}/libogg/include)
-
-set(t3dLibs "")
-set(t3dLibDirs "")
-
-# external things
-include_directories($ENV{DXSDK_DIR}/Include)
-set(t3dLibDirs "${t3dLibs};$ENV{DXSDK_DIR}/Lib/x86")
-
-# module helper
-
-set(t "")
-addLibPath(t "${srcDir}/app" GLOB_RECURSE)
+if(WIN32)
+    link_directories($ENV{DXSDK_DIR}/Lib/x86)
+endif()
 
+###############################################################################
+# Always enabled paths first
+###############################################################################
+addPath("${srcDir}/") # must come first :)
+addPathRec("${srcDir}/app")
+addPath("${srcDir}/sfx/media")
+addPath("${srcDir}/sfx/null")
+addPath("${srcDir}/sfx")
+addPath("${srcDir}/component")
+addPath("${srcDir}/component/interfaces")
+addPath("${srcDir}/console")
+addPath("${srcDir}/core")
+addPath("${srcDir}/core/stream")
+addPath("${srcDir}/core/strings")
+addPath("${srcDir}/core/util")
+addPath("${srcDir}/core/util/test")
+addPath("${srcDir}/core/util/journal")
+addPath("${srcDir}/core/util/journal/test")
+addPath("${srcDir}/core/util/zip")
+addPath("${srcDir}/core/util/zip/unitTests")
+addPath("${srcDir}/core/util/zip/compressors")
+addPath("${srcDir}/i18n")
+addPath("${srcDir}/sim")
+#addPath("${srcDir}/unit/tests")
+addPath("${srcDir}/unit")
+addPath("${srcDir}/util")
+addPath("${srcDir}/windowManager")
+addPath("${srcDir}/windowManager/torque")
+addPath("${srcDir}/windowManager/test")
+addPath("${srcDir}/math")
+addPath("${srcDir}/math/util")
+addPath("${srcDir}/math/test")
+addPath("${srcDir}/platform")
+addPath("${srcDir}/cinterface")
+addPath("${srcDir}/platform/nativeDialogs")
+addPath("${srcDir}/platform/menus")
+addPath("${srcDir}/platform/test")
+addPath("${srcDir}/platform/threads")
+addPath("${srcDir}/platform/async")
+addPath("${srcDir}/platform/input")
+addPath("${srcDir}/platform/output")
+addPath("${srcDir}/app")
+addPath("${srcDir}/app/net")
+addPath("${srcDir}/util/messaging")
+addPath("${srcDir}/gfx/Null")
+addPath("${srcDir}/gfx/test")
+addPath("${srcDir}/gfx/bitmap")
+addPath("${srcDir}/gfx/bitmap/loaders")
+addPath("${srcDir}/gfx/util")
+addPath("${srcDir}/gfx/video")
+addPath("${srcDir}/gfx")
+addPath("${srcDir}/shaderGen")
+addPath("${srcDir}/gfx/sim")
+addPath("${srcDir}/gui/buttons")
+addPath("${srcDir}/gui/containers")
+addPath("${srcDir}/gui/controls")
+addPath("${srcDir}/gui/core")
+addPath("${srcDir}/gui/game")
+addPath("${srcDir}/gui/shiny")
+addPath("${srcDir}/gui/utility")
+addPath("${srcDir}/gui")
+addPath("${srcDir}/collision")
+addPath("${srcDir}/materials")
+addPath("${srcDir}/lighting")
+addPath("${srcDir}/lighting/common")
+addPath("${srcDir}/renderInstance")
+addPath("${srcDir}/scene")
+addPath("${srcDir}/scene/culling")
+addPath("${srcDir}/scene/zones")
+addPath("${srcDir}/scene/mixin")
+addPath("${srcDir}/shaderGen")
+addPath("${srcDir}/terrain")
+addPath("${srcDir}/environment")
+addPath("${srcDir}/forest")
+addPath("${srcDir}/forest/ts")
+addPath("${srcDir}/ts")
+addPath("${srcDir}/ts/arch")
+addPath("${srcDir}/physics")
+addPath("${srcDir}/gui/3d")
+addPath("${srcDir}/postFx")
+addPath("${srcDir}/T3D")
+addPath("${srcDir}/T3D/examples")
+addPath("${srcDir}/T3D/fps")
+addPath("${srcDir}/T3D/fx")
+addPath("${srcDir}/T3D/vehicles")
+addPath("${srcDir}/T3D/physics")
+addPath("${srcDir}/T3D/decal")
+addPath("${srcDir}/T3D/sfx")
+addPath("${srcDir}/T3D/gameBase")
+addPath("${srcDir}/T3D/turret")
+addPath("${srcDir}/main/")
+addPathRec("${srcDir}/ts/collada")
+addPathRec("${srcDir}/ts/loader")
+
+###############################################################################
+# modular paths
+###############################################################################
 # lighting
-option(TORQUE_ADVANCED_LIGHTING "Advanced Lighting" ON)
 if(TORQUE_ADVANCED_LIGHTING)
-    add_definitions(-DTORQUE_ADVANCED_LIGHTING)
-    addLibPath(t "${srcDir}/lighting/advanced" GLOB)
-    addLibPath(t "${srcDir}/lighting/shadowMap" GLOB_RECURSE)
-    addLibPath(t "${srcDir}/lighting/advanced/hlsl" GLOB_RECURSE)
-    #addLibPath(t "${srcDir}/lighting/advanced/glsl" GLOB_RECURSE)
+    addPath("${srcDir}/lighting/advanced")
+    addPathRec("${srcDir}/lighting/shadowMap")
+    addPathRec("${srcDir}/lighting/advanced/hlsl")
+    #addPathRec("${srcDir}/lighting/advanced/glsl")
 endif()
-option(TORQUE_BASIC_LIGHTING "Basic Lighting" ON)
 if(TORQUE_BASIC_LIGHTING)
-    add_definitions(-DTORQUE_BASIC_LIGHTING)
-    addLibPath(t "${srcDir}/lighting/basic" GLOB_RECURSE)
-    addLibPath(t "${srcDir}/lighting/shadowMap" GLOB_RECURSE)
+    addPathRec("${srcDir}/lighting/basic")
+    addPathRec("${srcDir}/lighting/shadowMap")
 endif()
 
-# opcode
-include_directories(${libDir}/opcode)
-add_definitions(-DBAN_OPCODE_AUTOLINK)
-add_definitions(-DICE_NO_DLL)
-add_definitions(-DTORQUE_OPCODE)
-
-
-# collada
-add_definitions(-DTORQUE_COLLADA)
-add_definitions(-DDOM_INCLUDE_TINYXML)
-add_definitions(-DPCRE_STATIC)
-addLibPath(t "${srcDir}/ts/collada" GLOB_RECURSE)
-addLibPath(t "${srcDir}/ts/loader" GLOB_RECURSE)
-include_directories(${libDir}/collada/include)
-include_directories(${libDir}/collada/include/1.4)
-
 # DirectX Sound
-option(TORQUE_SFX_DirectX "DirectX Sound" ON)
 if(TORQUE_SFX_DirectX)
-    addLibPath(t "${srcDir}/sfx/dsound" GLOB_RECURSE)
-    addLibPath(t "${srcDir}/sfx/xaudio" GLOB_RECURSE)
-    set(t3dLibs "${t3dLibs};x3daudio.lib")
+    addPathRec("${srcDir}/sfx/dsound")
+    addPathRec("${srcDir}/sfx/xaudio")
 endif()
 
 # OpenAL
-option(TORQUE_SFX_OPENAL "OpenAL Sound" ON)
 if(TORQUE_SFX_OPENAL)
-    addLibPath(t "${srcDir}/sfx/openal" GLOB)
-    #addLibPath(t "${srcDir}/sfx/openal/mac" GLOB)
-    addLibPath(t "${srcDir}/sfx/openal/win32" GLOB)
-    include_directories(${libDir}/openal/win32)
-endif()
-
-# vorbis
-option(TORQUE_SFX_VORBIS "Vorbis Sound" ON)
-if(TORQUE_SFX_VORBIS)
-    add_definitions(-DTORQUE_OGGVORBIS)
-    include_directories(${libDir}/libvorbis/include)
-    set(t3dLibs "${t3dLibs};libvorbis;libogg")
+    addPath("${srcDir}/sfx/openal")
+    #addPath("${srcDir}/sfx/openal/mac")
+    addPath("${srcDir}/sfx/openal/win32")
 endif()
 
 # Theora
-option(TORQUE_THEORA "Theora Video Support" ON)
 if(TORQUE_THEORA)
-    add_definitions(-DTORQUE_OGGTHEORA)
-    add_definitions(-DTORQUE_OGGVORIBS)
-    addLibPath(t "${srcDir}/core/ogg" GLOB)
-    addLibPath(t "${srcDir}/gfx/video" GLOB)
-    addLibPath(t "${srcDir}/gui/theora" GLOB)
-    include_directories(${libDir}/libtheora/include)
-    set(t3dLibs "${t3dLibs};libtheora")
+    addPath("${srcDir}/core/ogg")
+    addPath("${srcDir}/gfx/video")
+    addPath("${srcDir}/gui/theora")
+endif()
+
+# Include tools for non-tool builds (or define player if a tool build)
+if(TORQUE_TOOLS)
+    addPath("${srcDir}/gui/worldEditor")
+    addPath("${srcDir}/environment/editors")
+    addPath("${srcDir}/forest/editor")
+    addPath("${srcDir}/gui/editor")
+    addPath("${srcDir}/gui/editor/inspector")
+endif()
+
+if(TORQUE_HIFI)
+    addPath("${srcDir}/T3D/gameBase/hifi")
+endif()
+    
+if(TORQUE_EXTENDED_MOVE)
+    addPath("${srcDir}/T3D/gameBase/extended")
+else()
+    addPath("${srcDir}/T3D/gameBase/std")
 endif()
 
-# Always on things
-addLibPath(t "${srcDir}/sfx/media" GLOB)
-addLibPath(t "${srcDir}/sfx/null" GLOB)
-addLibPath(t "${srcDir}/sfx" GLOB)
-
-# Components
-addLibPath(t "${srcDir}/component" GLOB)
-addLibPath(t "${srcDir}/component/interfaces" GLOB)
-
-   
-addLibPath(t "${srcDir}/console" GLOB)
-addLibPath(t "${srcDir}/core" GLOB)
-addLibPath(t "${srcDir}/core/stream" GLOB)
-addLibPath(t "${srcDir}/core/strings" GLOB)
-addLibPath(t "${srcDir}/core/util" GLOB)
-addLibPath(t "${srcDir}/core/util/test" GLOB)
-addLibPath(t "${srcDir}/core/util/journal" GLOB)
-addLibPath(t "${srcDir}/core/util/journal/test" GLOB)
-addLibPath(t "${srcDir}/core/util/zip" GLOB)
-addLibPath(t "${srcDir}/core/util/zip/unitTests" GLOB)
-addLibPath(t "${srcDir}/core/util/zip/compressors" GLOB)
-addLibPath(t "${srcDir}/i18n" GLOB)
-addLibPath(t "${srcDir}/sim" GLOB)
-#addLibPath(t "${srcDir}/unit/tests" GLOB)
-addLibPath(t "${srcDir}/unit" GLOB)
-addLibPath(t "${srcDir}/util" GLOB)
-addLibPath(t "${srcDir}/windowManager" GLOB)
-addLibPath(t "${srcDir}/windowManager/torque" GLOB)
-addLibPath(t "${srcDir}/windowManager/test" GLOB)
-addLibPath(t "${srcDir}/math" GLOB)
-addLibPath(t "${srcDir}/math/util" GLOB)
-addLibPath(t "${srcDir}/math/test" GLOB)
-addLibPath(t "${srcDir}/platform" GLOB)
-addLibPath(t "${srcDir}/cinterface" GLOB)
-
-addLibPath(t "${srcDir}/platform/nativeDialogs" GLOB)
-addLibPath(t "${srcDir}/platform/menus" GLOB)
-addLibPath(t "${srcDir}/platform/test" GLOB)
-
-addLibPath(t "${srcDir}/platform/threads" GLOB)
-addLibPath(t "${srcDir}/platform/async" GLOB)
-addLibPath(t "${srcDir}/platform/input" GLOB)
-addLibPath(t "${srcDir}/platform/output" GLOB)
-addLibPath(t "${srcDir}/app" GLOB)
-addLibPath(t "${srcDir}/app/net" GLOB)
-
-addLibPath(t "${srcDir}/util/messaging" GLOB)
-
-# win32
+###############################################################################
+# platform specific things
+###############################################################################
 if(WIN32)
-    #add_definitions(-DTORQUE_OS_WIN32)
-    addLibPath(t "${srcDir}/platformWin32" GLOB)
-    addLibPath(t "${srcDir}/platformWin32/nativeDialogs" GLOB)
-    addLibPath(t "${srcDir}/platformWin32/menus" GLOB)
-    addLibPath(t "${srcDir}/platformWin32/threads" GLOB)
-    addLibPath(t "${srcDir}/platformWin32/videoInfo" GLOB)
-    addLibPath(t "${srcDir}/platformWin32/minidump" GLOB)
-    addLibPath(t "${srcDir}/windowManager/win32" GLOB)
-    #addLibPath(t "${srcDir}/gfx/D3D8" GLOB)
-    addLibPath(t "${srcDir}/gfx/D3D" GLOB)
-    addLibPath(t "${srcDir}/gfx/D3D9" GLOB)
-    addLibPath(t "${srcDir}/gfx/D3D9/pc" GLOB)
-    addLibPath(t "${srcDir}/shaderGen/HLSL" GLOB)    
-    addLibPath(t "${srcDir}/terrain/hlsl" GLOB)
-    addLibPath(t "${srcDir}/forest/hlsl" GLOB)
+    addPath("${srcDir}/platformWin32")
+    addPath("${srcDir}/platformWin32/nativeDialogs")
+    addPath("${srcDir}/platformWin32/menus")
+    addPath("${srcDir}/platformWin32/threads")
+    addPath("${srcDir}/platformWin32/videoInfo")
+    addPath("${srcDir}/platformWin32/minidump")
+    addPath("${srcDir}/windowManager/win32")
+    #addPath("${srcDir}/gfx/D3D8")
+    addPath("${srcDir}/gfx/D3D")
+    addPath("${srcDir}/gfx/D3D9")
+    addPath("${srcDir}/gfx/D3D9/pc")
+    addPath("${srcDir}/shaderGen/HLSL")    
+    addPath("${srcDir}/terrain/hlsl")
+    addPath("${srcDir}/forest/hlsl")
+    # add windows rc file for the icon
+    addFile("${projectSrcDir}/torque-win.rc")
 endif()
 
-# mac
 if(APPLE)
-    #add_definitions(-DTORQUE_OS_MAC)
-    addLibPath(t "${srcDir}/platformMac" GLOB)
-    addLibPath(t "${srcDir}/platformMac/menus" GLOB)
-    addLibPath(t "${srcDir}/platformPOSIX" GLOB)
-    addLibPath(t "${srcDir}/windowManager/mac" GLOB)
-    addLibPath(t "${srcDir}/gfx/gl" GLOB)
-    addLibPath(t "${srcDir}/gfx/gl/ggl" GLOB)
-    addLibPath(t "${srcDir}/gfx/gl/ggl/mac" GLOB)
-    addLibPath(t "${srcDir}/gfx/gl/ggl/generated" GLOB)
-    addLibPath(t "${srcDir}/shaderGen/GLSL" GLOB)
-    addLibPath(t "${srcDir}/terrain/glsl" GLOB)
-    addLibPath(t "${srcDir}/forest/glsl" GLOB)    
+    addPath("${srcDir}/platformMac")
+    addPath("${srcDir}/platformMac/menus")
+    addPath("${srcDir}/platformPOSIX")
+    addPath("${srcDir}/windowManager/mac")
+    addPath("${srcDir}/gfx/gl")
+    addPath("${srcDir}/gfx/gl/ggl")
+    addPath("${srcDir}/gfx/gl/ggl/mac")
+    addPath("${srcDir}/gfx/gl/ggl/generated")
+    addPath("${srcDir}/shaderGen/GLSL")
+    addPath("${srcDir}/terrain/glsl")
+    addPath("${srcDir}/forest/glsl")    
 endif()
 
-# xbox360
 if(XBOX360)
-    #add_definitions(-D_XBOX)
-    #add_definitions(-DTORQUE_OS_XENON)
-    addLibPath(t "${srcDir}/platformXbox" GLOB)
-    addLibPath(t "${srcDir}/platformXbox/threads" GLOB)
-    addLibPath(t "${srcDir}/windowManager/360" GLOB)
-    addLibPath(t "${srcDir}/gfx/D3D9" GLOB)
-    addLibPath(t "${srcDir}/gfx/D3D9/360" GLOB)
-    addLibPath(t "${srcDir}/shaderGen/HLSL" GLOB)
-    addLibPath(t "${srcDir}/shaderGen/360" GLOB)
-    addLibPath(t "${srcDir}/ts/arch/360" GLOB)
-    addLibPath(t "${srcDir}/terrain/hlsl" GLOB)
-    addLibPath(t "${srcDir}/forest/hlsl" GLOB)
+    addPath("${srcDir}/platformXbox")
+    addPath("${srcDir}/platformXbox/threads")
+    addPath("${srcDir}/windowManager/360")
+    addPath("${srcDir}/gfx/D3D9")
+    addPath("${srcDir}/gfx/D3D9/360")
+    addPath("${srcDir}/shaderGen/HLSL")
+    addPath("${srcDir}/shaderGen/360")
+    addPath("${srcDir}/ts/arch/360")
+    addPath("${srcDir}/terrain/hlsl")
+    addPath("${srcDir}/forest/hlsl")
 endif()
 
-# ps3
 if(PS3)
-    #add_definitions(-DTORQUE_OS_PS3)
-    addLibPath(t "${srcDir}/platformPS3" GLOB)
-    addLibPath(t "${srcDir}/platformPS3/threads" GLOB)
-    addLibPath(t "${srcDir}/windowManager/ps3" GLOB)
-    # GFX - GGL
-    addLibPath(t "${srcDir}/gfx/gl" GLOB)
-    addLibPath(t "${srcDir}/gfx/gl/ggl" GLOB)
-    addLibPath(t "${srcDir}/gfx/gl/ggl/ps3" GLOB)
-    addLibPath(t "${srcDir}/gfx/gl/ggl/generated" GLOB)
-    addLibPath(t "${srcDir}/shaderGen/GLSL" GLOB)
-    addLibPath(t "${srcDir}/ts/arch/ps3" GLOB)
-    addLibPath(t "${srcDir}/terrain/glsl" GLOB)
-    addLibPath(t "${srcDir}/forest/glsl" GLOB)    
+    addPath("${srcDir}/platformPS3")
+    addPath("${srcDir}/platformPS3/threads")
+    addPath("${srcDir}/windowManager/ps3")
+    addPath("${srcDir}/gfx/gl")
+    addPath("${srcDir}/gfx/gl/ggl")
+    addPath("${srcDir}/gfx/gl/ggl/ps3")
+    addPath("${srcDir}/gfx/gl/ggl/generated")
+    addPath("${srcDir}/shaderGen/GLSL")
+    addPath("${srcDir}/ts/arch/ps3")
+    addPath("${srcDir}/terrain/glsl")
+    addPath("${srcDir}/forest/glsl")    
 endif()
 
 if(UNIX)
-    #add_definitions(-DTORQUE_OS_LINUX)
     # linux_dedicated
-    addLibPath(t "${srcDir}/windowManager/dedicated" GLOB)
+    addPath("${srcDir}/windowManager/dedicated")
     # linux
-    addLibPath(t "${srcDir}/platformX86UNIX" GLOB)
-    addLibPath(t "${srcDir}/platformX86UNIX/threads" GLOB)
-    addLibPath(t "${srcDir}/platformPOSIX" GLOB)
-    # GFX - GGL
-    addLibPath(t "${srcDir}/gfx/gl" GLOB)
-    addLibPath(t "${srcDir}/gfx/gl/ggl" GLOB)
-    addLibPath(t "${srcDir}/gfx/gl/ggl/x11" GLOB) # This one is not yet implemented!
-    addLibPath(t "${srcDir}/gfx/gl/ggl/generated" GLOB)
-    addLibPath(t "${srcDir}/shaderGen/GLSL" GLOB)
-    addLibPath(t "${srcDir}/terrain/glsl" GLOB)
-    addLibPath(t "${srcDir}/forest/glsl" GLOB)    
+    addPath("${srcDir}/platformX86UNIX")
+    addPath("${srcDir}/platformX86UNIX/threads")
+    addPath("${srcDir}/platformPOSIX")
+    addPath("${srcDir}/gfx/gl")
+    addPath("${srcDir}/gfx/gl/ggl")
+    addPath("${srcDir}/gfx/gl/ggl/x11") # This one is not yet implemented!
+    addPath("${srcDir}/gfx/gl/ggl/generated")
+    addPath("${srcDir}/shaderGen/GLSL")
+    addPath("${srcDir}/terrain/glsl")
+    addPath("${srcDir}/forest/glsl")    
 endif()
 
-# GFX
-addLibPath(t "${srcDir}/gfx/Null" GLOB)
-addLibPath(t "${srcDir}/gfx/test" GLOB)
-addLibPath(t "${srcDir}/gfx/bitmap" GLOB)
-addLibPath(t "${srcDir}/gfx/bitmap/loaders" GLOB)
-addLibPath(t "${srcDir}/gfx/util" GLOB)
-addLibPath(t "${srcDir}/gfx/video" GLOB)
-addLibPath(t "${srcDir}/gfx" GLOB)
-addLibPath(t "${srcDir}/shaderGen" GLOB)
-
-# GFX - Sim dependent 
-addLibPath(t "${srcDir}/gfx/sim" GLOB)
-
-# GUI
-addLibPath(t "${srcDir}/gui/buttons" GLOB)
-addLibPath(t "${srcDir}/gui/containers" GLOB)
-addLibPath(t "${srcDir}/gui/controls" GLOB)
-
-addLibPath(t "${srcDir}/gui/core" GLOB)
-addLibPath(t "${srcDir}/gui/game" GLOB)
-addLibPath(t "${srcDir}/gui/shiny" GLOB)
-addLibPath(t "${srcDir}/gui/utility" GLOB)
-addLibPath(t "${srcDir}/gui" GLOB)
+###############################################################################
+###############################################################################
+addExecutable()
+###############################################################################
+###############################################################################
 
-# Include tools for non-tool builds (or define player if a tool build)
-addLibPath(t "${srcDir}/gui/worldEditor" GLOB)
-addLibPath(t "${srcDir}/environment/editors" GLOB)
-addLibPath(t "${srcDir}/forest/editor" GLOB)
-addLibPath(t "${srcDir}/gui/editor" GLOB)
-addLibPath(t "${srcDir}/gui/editor/inspector" GLOB)
-
-# T3D
-# 3D
-addLibPath(t "${srcDir}/collision" GLOB)
-addLibPath(t "${srcDir}/materials" GLOB)
-addLibPath(t "${srcDir}/lighting" GLOB)
-addLibPath(t "${srcDir}/lighting/common" GLOB)
-addLibPath(t "${srcDir}/renderInstance" GLOB)
-addLibPath(t "${srcDir}/scene" GLOB)
-addLibPath(t "${srcDir}/scene/culling" GLOB)
-addLibPath(t "${srcDir}/scene/zones" GLOB)
-addLibPath(t "${srcDir}/scene/mixin" GLOB)
-addLibPath(t "${srcDir}/shaderGen" GLOB)
-addLibPath(t "${srcDir}/terrain" GLOB)
-addLibPath(t "${srcDir}/environment" GLOB)
-
-addLibPath(t "${srcDir}/forest" GLOB)
-addLibPath(t "${srcDir}/forest/ts" GLOB)
-
-addLibPath(t "${srcDir}/ts" GLOB)
-addLibPath(t "${srcDir}/ts/arch" GLOB)
-addLibPath(t "${srcDir}/physics" GLOB)
-addLibPath(t "${srcDir}/gui/3d" GLOB)
-addLibPath(t "${srcDir}/postFx" GLOB)
-
-# 3D game
-addLibPath(t "${srcDir}/T3D" GLOB)
-addLibPath(t "${srcDir}/T3D/examples" GLOB)
-addLibPath(t "${srcDir}/T3D/fps" GLOB)
-addLibPath(t "${srcDir}/T3D/fx" GLOB)
-addLibPath(t "${srcDir}/T3D/vehicles" GLOB)
-addLibPath(t "${srcDir}/T3D/physics" GLOB)
-addLibPath(t "${srcDir}/T3D/decal" GLOB)
-addLibPath(t "${srcDir}/T3D/sfx" GLOB)
-addLibPath(t "${srcDir}/T3D/gameBase" GLOB)
-addLibPath(t "${srcDir}/T3D/turret" GLOB)
-
-# HIFI NET
-option(TORQUE_HIFI "HIFI? support" OFF)
-if(TORQUE_HIFI)
-    add_definitions(-DTORQUE_HIFI_NET)
-    addLibPath(t "${srcDir}/T3D/gameBase/hifi" GLOB)
+# configure only once
+if(NOT EXISTS ${projectSrcDir}/torqueConfig.h)
+    message(STATUS "writing ${projectSrcDir}/torqueConfig.h")
+    CONFIGURE_FILE(${cmakeDir}/torqueConfig.h.in ${projectSrcDir}/torqueConfig.h)
+    CONFIGURE_FILE(${cmakeDir}/torque-win.rc.in ${projectSrcDir}/torque-win.rc)
+    CONFIGURE_FILE(${cmakeDir}/torque.ico ${projectSrcDir}/torque.ico COPYONLY)
 endif()
 
-# extended move
-option(TORQUE_EXTENDED_MOVE "Extended move support" OFF)
-if(TORQUE_EXTENDED_MOVE)
-    add_definitions(-DTORQUE_EXTENDED_MOVE)
-    addLibPath(t "${srcDir}/T3D/gameBase/extended" GLOB)
-else()
-    addLibPath(t "${srcDir}/T3D/gameBase/std" GLOB)
-endif()
+###############################################################################
+# Common Libraries
+###############################################################################
+addLib("lmng;lpng;lungif;ljpeg;zlib;tinyxml;opcode;squish;collada;pcre;convexDecomp")
 
 if(WIN32)
     # copy pasted from T3D build system, some might not be needed
-    set(t3dLibs "${t3dLibs};COMCTL32.LIB;COMDLG32.LIB;USER32.LIB;ADVAPI32.LIB;GDI32.LIB;WINMM.LIB;WSOCK32.LIB;vfw32.lib;Imm32.lib;d3d9.lib;d3dx9.lib;DxErr.lib;ole32.lib;shell32.lib;oleaut32.lib;version.lib")
-    
-    # add windows rc file for the icon
-    set(t "${t};${projectSrcDir}/torque-win.rc")
+    addLib("COMCTL32.LIB;COMDLG32.LIB;USER32.LIB;ADVAPI32.LIB;GDI32.LIB;WINMM.LIB;WSOCK32.LIB;vfw32.lib;Imm32.lib;d3d9.lib;d3dx9.lib;DxErr.lib;ole32.lib;shell32.lib;oleaut32.lib;version.lib")
 endif()
 
-# add main/main.cpp
-set(t "${t};${srcDir}/main/main.cpp;")
+###############################################################################
+# Always enabled Definitions
+###############################################################################
+addDef(TORQUE_SHADERGEN)
+addDef(INITGUID)
+addDef(NTORQUE_SHARED)
+addDef(UNICODE)
+addDef(_UNICODE) # for VS
+addDef(TORQUE_UNICODE)
+#addDef(TORQUE_SHARED)
+addDef(LTC_NO_PROTOTYPES) # for libTomCrypt
+addDef(BAN_OPCODE_AUTOLINK)
+addDef(ICE_NO_DLL)
+addDef(TORQUE_OPCODE)
+addDef(TORQUE_COLLADA)
+addDef(DOM_INCLUDE_TINYXML)
+addDef(PCRE_STATIC)
+addDef(_CRT_SECURE_NO_WARNINGS)
+addDef(_CRT_SECURE_NO_DEPRECATE)
+
+
+###############################################################################
+# Modules
+###############################################################################
+if(TORQUE_SFX_DirectX)
+    addLib(x3daudio.lib)
+endif()
 
-# configure only once
-if(NOT EXISTS ${projectSrcDir}/torqueConfig.h)
-    message(STATUS "writing ${projectSrcDir}/torqueConfig.h")
-    CONFIGURE_FILE(${cmakeDir}/torqueConfig.h.in ${projectSrcDir}/torqueConfig.h)
-    CONFIGURE_FILE(${cmakeDir}/torque-win.rc.in ${projectSrcDir}/torque-win.rc)
-    CONFIGURE_FILE(${cmakeDir}/torque.ico ${projectSrcDir}/torque.ico COPYONLY)
+if(TORQUE_ADVANCED_LIGHTING)
+    addDef(TORQUE_ADVANCED_LIGHTING)
+endif()
+if(TORQUE_BASIC_LIGHTING)
+    addDef(TORQUE_BASIC_LIGHTING)
+endif()
+
+if(TORQUE_SFX_OPENAL)
+    addInclude("${libDir}/openal/win32")
+endif()
+
+if(TORQUE_SFX_VORBIS)
+    addInclude(${libDir}/libvorbis/include)
+    addDef(TORQUE_OGGVORBIS)
+    addLib(libvorbis)
+    addLib(libogg)
 endif()
 
+if(TORQUE_THEORA)
+    addDef(TORQUE_OGGTHEORA)
+    addDef(TORQUE_OGGVORIBS)
+    addInclude(${libDir}/libtheora/include)
+    addLib(libtheora)
+endif()
 
-# internal libs
-set(t3dLibs "${t3dLibs};lmng;lpng;lungif;ljpeg;zlib;tinyxml;opcode;squish;collada;pcre;convexDecomp")
-#set(t3dLibs "${t3dLibs};libtorque3d")
-link_directories(${t3dLibDirs})
+if(TORQUE_HIFI)
+    addDef(TORQUE_HIFI_NET)
+endif()
+if(TORQUE_EXTENDED_MOVE)
+    addDef(TORQUE_EXTENDED_MOVE)
+endif()
 
-#addLibraryFinal("${t}" "libtorque3d")
-addExecutableFinal("${t}" "torque3d" "${srcDir}")
+###############################################################################
+# Include Paths
+###############################################################################
+addInclude("${projectSrcDir}")
+addInclude("${srcDir}/")
+addInclude("${libDir}/lmpg")
+addInclude("${libDir}/lpng")
+addInclude("${libDir}/ljpeg")
+addInclude("${libDir}/lungif")
+addInclude("${libDir}/zlib")
+addInclude("${libDir}/") # for tinyxml
+addInclude("${libDir}/tinyxml")
+addInclude("${libDir}/squish")
+addInclude("${libDir}/convexDecomp")
+addInclude("${libDir}/libogg/include")
+addInclude("${libDir}/opcode")
+addInclude("${libDir}/collada/include")
+addInclude("${libDir}/collada/include/1.4")
 
-target_link_libraries(torque3d ${t3dLibs})
+# external things
+if(WIN32)
+    set_property(TARGET ${PROJECT_NAME} APPEND PROPERTY INCLUDE_DIRECTORIES $ENV{DXSDK_DIR}/Include)
+endif()
 
+###############################################################################
+# Installation
+###############################################################################
 INSTALL_TARGETS(/ torque3d)
 INSTALL_FILES(/ FILES ${CMAKE_SOURCE_DIR}/Templates/${TORQUE_TEMPLATE}/game/)

Tools/CMake/torqueConfig.h.in

@@ -31,7 +31,7 @@
 //not only to your game proper, but also to all of your tools.
 
 /// What's the name of your application? Used in a variety of places.
-#define TORQUE_APP_NAME            "Empty"
+#define TORQUE_APP_NAME            "@TORQUE_APP_NAME@"
 
 /// What version of the application specific source code is this?
 ///

Tools/CMake/zlib.cmake

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