Merge branch 'PBR_ProbeArrayGLWIP' of https://github.com/Azaezel/Torque3D into development

Tools/CMake/torque3d.cmake

@@ -214,12 +214,13 @@ if(WIN32)
     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")
-
-    if( TORQUE_CPU_X64 )
-        link_directories($ENV{DXSDK_DIR}/Lib/x64)
-    else()
-        link_directories($ENV{DXSDK_DIR}/Lib/x86)
-    endif()
+	if(TORQUE_SFX_DirectX) 
+		if( TORQUE_CPU_X64 )
+			link_directories($ENV{DXSDK_DIR}/Lib/x64)
+		else()
+			link_directories($ENV{DXSDK_DIR}/Lib/x86)
+		endif()
+	endif()
 endif()
 
 # build types
@@ -336,6 +337,7 @@ addPath("${srcDir}/T3D/decal")
 addPath("${srcDir}/T3D/sfx")
 addPath("${srcDir}/T3D/gameBase")
 addPath("${srcDir}/T3D/turret")
+addPath("${srcDir}/T3D/lighting")
 addPathRec("${srcDir}/T3D/components/")
 addPathRec("${srcDir}/T3D/systems")
 
@@ -828,11 +830,6 @@ if(UNIX AND NOT APPLE)
 	addInclude("/usr/include/freetype2")
 endif()
 
-# external things
-if(WIN32)
-    set_property(TARGET ${PROJECT_NAME} APPEND PROPERTY INCLUDE_DIRECTORIES $ENV{DXSDK_DIR}/Include)
-endif()
-
 if(MSVC)
     # Match projectGenerator naming for executables
     set(OUTPUT_CONFIG DEBUG MINSIZEREL RELWITHDEBINFO)

Tools/CMake/torqueConfig.h.in

@@ -195,17 +195,3 @@
 #else
 #  define TORQUE_INSTANCE_EXCLUSION   "TorqueTest"
 #endif
-
-// Someday, it might make sense to do some pragma magic here so we error
-// on inconsistent flags.
-
-// The Xbox360 has it's own profiling tools, the Torque Profiler should not be used
-#ifdef TORQUE_OS_XENON
-#  ifdef TORQUE_ENABLE_PROFILER
-#     undef TORQUE_ENABLE_PROFILER
-#  endif
-#
-#  ifdef TORQUE_ENABLE_PROFILE_PATH
-#     undef TORQUE_ENABLE_PROFILE_PATH
-#endif
-#endif