Updated CMake files with new dependency paths

Added Game post-build step for CMake
Fixed VS post-build step for BansheeSL to be in line with new dependency paths

Build/VS2015/BansheeSL.vcxproj

@@ -134,8 +134,8 @@
       <ImportLibrary>..\..\lib\x86\$(Configuration)\$(TargetName).lib</ImportLibrary>
     </Link>
     <PreBuildEvent>
-      <Command>"..\..\Source\BansheeSL\Dependencies\tools\flex\flex.exe" --wincompat "..\..\Source\BansheeSL\BsLexerFX.l"
-"..\..\Source\BansheeSL\Dependencies\tools\bison\bison.exe" "..\..\Source\BansheeSL\BsParserFX.y"
+      <Command>"..\..\Dependencies\BansheeSL\tools\flex\flex.exe" --wincompat "..\..\Source\BansheeSL\BsLexerFX.l"
+"..\..\Dependencies\BansheeSL\tools\bison\bison.exe" "..\..\Source\BansheeSL\BsParserFX.y"
 xcopy /Y /I "BsLexerFX.h" "..\..\Source\BansheeSL\Include"
 xcopy /Y /I "BsLexerFX.c" "..\..\Source\BansheeSL\Source"
 xcopy /Y /I "BsParserFX.h" "..\..\Source\BansheeSL\Include"
@@ -164,8 +164,8 @@ del BsLexerFX.h BsLexerFX.c BsParserFX.h BsParserFX.c</Command>
       <ImportLibrary>..\..\lib\$(Platform)\$(Configuration)\$(TargetName).lib</ImportLibrary>
     </Link>
     <PreBuildEvent>
-      <Command>"..\..\Source\BansheeSL\Dependencies\tools\flex\flex.exe" --wincompat "..\..\Source\BansheeSL\BsLexerFX.l"
-"..\..\Source\BansheeSL\Dependencies\tools\bison\bison.exe" "..\..\Source\BansheeSL\BsParserFX.y"
+      <Command>"..\..\Dependencies\BansheeSL\tools\flex\flex.exe" --wincompat "..\..\Source\BansheeSL\BsLexerFX.l"
+"..\..\Dependencies\BansheeSL\tools\bison\bison.exe" "..\..\Source\BansheeSL\BsParserFX.y"
 xcopy /Y /I "BsLexerFX.h" "..\..\Source\BansheeSL\Include"
 xcopy /Y /I "BsLexerFX.c" "..\..\Source\BansheeSL\Source"
 xcopy /Y /I "BsParserFX.h" "..\..\Source\BansheeSL\Include"
@@ -199,8 +199,8 @@ del BsLexerFX.h BsLexerFX.c BsParserFX.h BsParserFX.c</Command>
       <ImportLibrary>..\..\lib\x86\$(Configuration)\$(TargetName).lib</ImportLibrary>
     </Link>
     <PreBuildEvent>
-      <Command>"..\..\Source\BansheeSL\Dependencies\tools\flex\flex.exe" --wincompat "..\..\Source\BansheeSL\BsLexerFX.l"
-"..\..\Source\BansheeSL\Dependencies\tools\bison\bison.exe" "..\..\Source\BansheeSL\BsParserFX.y"
+      <Command>"..\..\Dependencies\BansheeSL\tools\flex\flex.exe" --wincompat "..\..\Source\BansheeSL\BsLexerFX.l"
+"..\..\Dependencies\BansheeSL\tools\bison\bison.exe" "..\..\Source\BansheeSL\BsParserFX.y"
 xcopy /Y /I "BsLexerFX.h" "..\..\Source\BansheeSL\Include"
 xcopy /Y /I "BsLexerFX.c" "..\..\Source\BansheeSL\Source"
 xcopy /Y /I "BsParserFX.h" "..\..\Source\BansheeSL\Include"
@@ -234,8 +234,8 @@ del BsLexerFX.h BsLexerFX.c BsParserFX.h BsParserFX.c</Command>
       <ImportLibrary>..\..\lib\$(Platform)\$(Configuration)\$(TargetName).lib</ImportLibrary>
     </Link>
     <PreBuildEvent>
-      <Command>"..\..\Source\BansheeSL\Dependencies\tools\flex\flex.exe" --wincompat "..\..\Source\BansheeSL\BsLexerFX.l"
-"..\..\Source\BansheeSL\Dependencies\tools\bison\bison.exe" "..\..\Source\BansheeSL\BsParserFX.y"
+      <Command>"..\..\Dependencies\BansheeSL\tools\flex\flex.exe" --wincompat "..\..\Source\BansheeSL\BsLexerFX.l"
+"..\..\Dependencies\BansheeSL\tools\bison\bison.exe" "..\..\Source\BansheeSL\BsParserFX.y"
 xcopy /Y /I "BsLexerFX.h" "..\..\Source\BansheeSL\Include"
 xcopy /Y /I "BsLexerFX.c" "..\..\Source\BansheeSL\Source"
 xcopy /Y /I "BsParserFX.h" "..\..\Source\BansheeSL\Include"
@@ -268,8 +268,8 @@ del BsLexerFX.h BsLexerFX.c BsParserFX.h BsParserFX.c</Command>
       <ImportLibrary>..\..\lib\x86\$(Configuration)\$(TargetName).lib</ImportLibrary>
     </Link>
     <PreBuildEvent>
-      <Command>"..\..\Source\BansheeSL\Dependencies\tools\flex\flex.exe" --wincompat "..\..\Source\BansheeSL\BsLexerFX.l"
-"..\..\Source\BansheeSL\Dependencies\tools\bison\bison.exe" "..\..\Source\BansheeSL\BsParserFX.y"
+      <Command>"..\..\Dependencies\BansheeSL\tools\flex\flex.exe" --wincompat "..\..\Source\BansheeSL\BsLexerFX.l"
+"..\..\Dependencies\BansheeSL\tools\bison\bison.exe" "..\..\Source\BansheeSL\BsParserFX.y"
 xcopy /Y /I "BsLexerFX.h" "..\..\Source\BansheeSL\Include"
 xcopy /Y /I "BsLexerFX.c" "..\..\Source\BansheeSL\Source"
 xcopy /Y /I "BsParserFX.h" "..\..\Source\BansheeSL\Include"
@@ -302,8 +302,8 @@ del BsLexerFX.h BsLexerFX.c BsParserFX.h BsParserFX.c</Command>
       <ImportLibrary>..\..\lib\$(Platform)\$(Configuration)\$(TargetName).lib</ImportLibrary>
     </Link>
     <PreBuildEvent>
-      <Command>"..\..\Source\BansheeSL\Dependencies\tools\flex\flex.exe" --wincompat "..\..\Source\BansheeSL\BsLexerFX.l"
-"..\..\Source\BansheeSL\Dependencies\tools\bison\bison.exe" "..\..\Source\BansheeSL\BsParserFX.y"
+      <Command>"..\..\Dependencies\BansheeSL\tools\flex\flex.exe" --wincompat "..\..\Source\BansheeSL\BsLexerFX.l"
+"..\..\Dependencies\BansheeSL\tools\bison\bison.exe" "..\..\Source\BansheeSL\BsParserFX.y"
 xcopy /Y /I "BsLexerFX.h" "..\..\Source\BansheeSL\Include"
 xcopy /Y /I "BsLexerFX.c" "..\..\Source\BansheeSL\Source"
 xcopy /Y /I "BsParserFX.h" "..\..\Source\BansheeSL\Include"

Source/BansheeCore/CMakeLists.txt

@@ -5,7 +5,7 @@ include(CMakeSources.cmake)
 set(BansheeCore_INC 
 	"Include" 
 	"../BansheeUtility/Include" 
-	"../../Dependencies/Include")
+	"../../Dependencies/BansheeCore/Include")
 
 if(WIN32)
 	set(BansheeCore_INC ${BansheeCore_INC} "Include/Win32")
@@ -21,19 +21,14 @@ target_compile_definitions(BansheeCore PRIVATE -DBS_CORE_EXPORTS)
 
 # Libraries
 ## External lib: NVTT
-add_library(nvtt STATIC IMPORTED)
-set_target_properties(nvtt PROPERTIES IMPORTED_LOCATION_DEBUG ${BS_LIBRARY_DEPENDENCIES_DIR_DEBUG}/nvtt${BS_LIBRARY_EXTENSION})
-set_target_properties(nvtt PROPERTIES IMPORTED_LOCATION_OPTIMIZEDDEBUG ${BS_LIBRARY_DEPENDENCIES_DIR_OPTIMIZEDDEBUG}/nvtt${BS_LIBRARY_EXTENSION})
-set_target_properties(nvtt PROPERTIES IMPORTED_LOCATION_RELEASE ${BS_LIBRARY_DEPENDENCIES_DIR_RELEASE}/nvtt${BS_LIBRARY_EXTENSION})	
-	
-target_link_libraries(BansheeCore nvtt)	
-	
+add_library_per_config(BansheeCore nvtt)
+
 ## Local libs
-target_link_libraries(BansheeCore BansheeUtility)	
+target_link_libraries(BansheeCore PUBLIC BansheeUtility)	
 	
 ## OS libs
 if(WIN32)
-target_link_libraries(BansheeCore Winmm)
+target_link_libraries(BansheeCore PRIVATE Winmm)
 else()
 	# TODO_OTHER_PLATFORMS_GO_HERE
 endif()

Source/BansheeD3D11RenderAPI/CMakeLists.txt

@@ -5,8 +5,7 @@ include(CMakeSources.cmake)
 set(BansheeD3D11RenderAPI_INC 
 	"Include" 
 	"../BansheeUtility/Include" 
-	"../BansheeCore/Include"
-	"../../Dependencies/Include")
+	"../BansheeCore/Include")
 
 include_directories(${BansheeD3D11RenderAPI_INC})	
 	

Source/BansheeD3D9RenderAPI/CMakeLists.txt

@@ -6,7 +6,6 @@ set(BansheeD3D9RenderAPI_INC
 	"Include" 
 	"../BansheeUtility/Include" 
 	"../BansheeCore/Include"
-	"../../Dependencies/Include"
 	"$ENV{DXSDK_DIR}Include")
 
 include_directories(${BansheeD3D9RenderAPI_INC})	

Source/BansheeEditor/CMakeLists.txt

@@ -6,8 +6,7 @@ set(BansheeEditor_INC
 	"Include" 
 	"../BansheeUtility/Include" 
 	"../BansheeCore/Include"
-	"../BansheeEngine/Include"
-	"../../Dependencies/Include")
+	"../BansheeEngine/Include")
 
 include_directories(${BansheeEditor_INC})	
 	

Source/BansheeEditorExec/CMakeLists.txt

@@ -7,8 +7,7 @@ set(BansheeEditorExec_INC
 	"../BansheeUtility/Include" 
 	"../BansheeCore/Include"
 	"../BansheeEngine/Include"
-	"../BansheeEditor/Include"
-	"../../Dependencies/Include")
+	"../BansheeEditor/Include")
 
 include_directories(${BansheeEditorExec_INC})	
 	

Source/BansheeEngine/CMakeLists.txt

@@ -5,8 +5,7 @@ include(CMakeSources.cmake)
 set(BansheeEngine_INC 
 	"Include" 
 	"../BansheeUtility/Include" 
-	"../BansheeCore/Include"
-	"../../Dependencies/Include")
+	"../BansheeCore/Include")
 
 include_directories(${BansheeEngine_INC})	
 	

Source/BansheeFBXImporter/CMakeLists.txt

@@ -4,10 +4,9 @@ include(CMakeSources.cmake)
 # Includes
 set(BansheeFBXImporter_INC 
 	"Include" 
-	"Dependencies/Include"
 	"../BansheeUtility/Include" 
 	"../BansheeCore/Include"
-	"../../Dependencies/Include")
+	"../../Dependencies/BansheeFBXImporter/Include")
 
 include_directories(${BansheeFBXImporter_INC})	
 	
@@ -18,22 +17,11 @@ add_library(BansheeFBXImporter SHARED ${BS_BANSHEEFBXIMPORTER_SRC})
 target_compile_definitions(BansheeFBXImporter PRIVATE -DBS_FBX_EXPORTS)
 
 # Libraries
-if(BS_64BIT)
-	set(BS_LOCAL_LIB_PATH ${CMAKE_CURRENT_SOURCE_DIR}/Dependencies/lib/x64)
-else()
-	set(BS_LOCAL_LIB_PATH ${CMAKE_CURRENT_SOURCE_DIR}/Dependencies/lib/x86)
-endif()
-
 ## External lib: FBX
-add_library(FBX STATIC IMPORTED)
-set_target_properties(FBX PROPERTIES IMPORTED_LOCATION_DEBUG ${BS_LOCAL_LIB_PATH}/Debug/libfbxsdk-md${BS_LIBRARY_EXTENSION})
-set_target_properties(FBX PROPERTIES IMPORTED_LOCATION_OPTIMIZEDDEBUG ${BS_LOCAL_LIB_PATH}/OptimizedDebug/libfbxsdk-md${BS_LIBRARY_EXTENSION})
-set_target_properties(FBX PROPERTIES IMPORTED_LOCATION_RELEASE ${BS_LOCAL_LIB_PATH}/Release/libfbxsdk-md${BS_LIBRARY_EXTENSION})	
-	
-target_link_libraries(BansheeFBXImporter FBX)	
+add_library_per_config(BansheeFBXImporter libfbxsdk-md)	
 
 ## Local libs
-target_link_libraries(BansheeFBXImporter BansheeUtility BansheeCore)
+target_link_libraries(BansheeFBXImporter PUBLIC BansheeUtility BansheeCore)
 
 # IDE specific
 set_property(TARGET BansheeFBXImporter PROPERTY FOLDER Plugins)

Source/BansheeFontImporter/CMakeLists.txt

@@ -4,10 +4,9 @@ include(CMakeSources.cmake)
 # Includes
 set(BansheeFontImporter_INC 
 	"Include" 
-	"Dependencies/Include"
 	"../BansheeUtility/Include" 
 	"../BansheeCore/Include"
-	"../../Dependencies/Include")
+	"../../Dependencies/BansheeFontImporter/Include")
 
 include_directories(${BansheeFontImporter_INC})	
 	
@@ -18,22 +17,11 @@ add_library(BansheeFontImporter SHARED ${BS_BANSHEEFONTIMPORTER_SRC})
 target_compile_definitions(BansheeFontImporter PRIVATE -DBS_FONT_EXPORTS -DUSE_FREETYPE2_STATIC)
 
 # Libraries
-if(BS_64BIT)
-	set(BS_LOCAL_LIB_PATH ${CMAKE_CURRENT_SOURCE_DIR}/Dependencies/lib/x64)
-else()
-	set(BS_LOCAL_LIB_PATH ${CMAKE_CURRENT_SOURCE_DIR}/Dependencies/lib/x86)
-endif()
-
 ## External lib: FreeType
-add_library(FreeType STATIC IMPORTED)
-set_target_properties(FreeType PROPERTIES IMPORTED_LOCATION_DEBUG ${BS_LOCAL_LIB_PATH}/Debug/freetype${BS_LIBRARY_EXTENSION})
-set_target_properties(FreeType PROPERTIES IMPORTED_LOCATION_OPTIMIZEDDEBUG ${BS_LOCAL_LIB_PATH}/OptimizedDebug/freetype${BS_LIBRARY_EXTENSION})
-set_target_properties(FreeType PROPERTIES IMPORTED_LOCATION_RELEASE ${BS_LOCAL_LIB_PATH}/Release/freetype${BS_LIBRARY_EXTENSION})	
-	
-target_link_libraries(BansheeFontImporter FreeType)	
+add_library_per_config(BansheeFontImporter freetype)
 
 ## Local libs
-target_link_libraries(BansheeFontImporter BansheeUtility BansheeCore)
+target_link_libraries(BansheeFontImporter PUBLIC BansheeUtility BansheeCore)
 
 # IDE specific
 set_property(TARGET BansheeFontImporter PROPERTY FOLDER Plugins)

Source/BansheeFreeImgImporter/CMakeLists.txt

@@ -4,10 +4,9 @@ include(CMakeSources.cmake)
 # Includes
 set(BansheeFreeImgImporter_INC 
 	"Include" 
-	"Dependencies/Include"
 	"../BansheeUtility/Include" 
 	"../BansheeCore/Include"
-	"../../Dependencies/Include")
+	"../../Dependencies/BansheeFreeImgImporter/Include")
 
 include_directories(${BansheeFreeImgImporter_INC})	
 	
@@ -18,22 +17,11 @@ add_library(BansheeFreeImgImporter SHARED ${BS_BANSHEEFREEIMGIMPORTER_SRC})
 target_compile_definitions(BansheeFreeImgImporter PRIVATE -DBS_FREEIMG_EXPORTS -D_MBCS -DFREEIMAGE_LIB)
 
 # Libraries
-if(BS_64BIT)
-	set(BS_LOCAL_LIB_PATH ${CMAKE_CURRENT_SOURCE_DIR}/Dependencies/lib/x64)
-else()
-	set(BS_LOCAL_LIB_PATH ${CMAKE_CURRENT_SOURCE_DIR}/Dependencies/lib/x86)
-endif()
-
 ## External lib: FreeImage
-add_library(FreeImage STATIC IMPORTED)
-set_target_properties(FreeImage PROPERTIES IMPORTED_LOCATION_DEBUG ${BS_LOCAL_LIB_PATH}/Debug/FreeImage${BS_LIBRARY_EXTENSION})
-set_target_properties(FreeImage PROPERTIES IMPORTED_LOCATION_OPTIMIZEDDEBUG ${BS_LOCAL_LIB_PATH}/OptimizedDebug/FreeImage${BS_LIBRARY_EXTENSION})
-set_target_properties(FreeImage PROPERTIES IMPORTED_LOCATION_RELEASE ${BS_LOCAL_LIB_PATH}/Release/FreeImage${BS_LIBRARY_EXTENSION})	
-	
-target_link_libraries(BansheeFreeImgImporter FreeImage)	
+add_library_per_config(BansheeFreeImgImporter FreeImage)
 
 ## Local libs
-target_link_libraries(BansheeFreeImgImporter BansheeUtility BansheeCore)
+target_link_libraries(BansheeFreeImgImporter PUBLIC BansheeUtility BansheeCore)
 
 # IDE specific
 set_property(TARGET BansheeFreeImgImporter PROPERTY FOLDER Plugins)

Source/BansheeGLRenderAPI/CMakeLists.txt

@@ -6,7 +6,6 @@ set(BansheeGLRenderAPI_INC
 	"Include" 
 	"../BansheeUtility/Include" 
 	"../BansheeCore/Include"
-	"../../Dependencies/Include"
 	"Source/GLSL/include")
 
 if(WIN32)

Source/BansheeMono/CMakeLists.txt

@@ -7,7 +7,7 @@ set(BansheeMono_INC
 	"../BansheeUtility/Include" 
 	"../BansheeCore/Include"
 	"../BansheeEngine/Include"
-	"../../Dependencies/Include")
+	"../../Dependencies/BansheeMono/Include")
 
 include_directories(${BansheeMono_INC})	
 	
@@ -18,22 +18,11 @@ add_library(BansheeMono SHARED ${BS_BANSHEEMONO_SRC})
 target_compile_definitions(BansheeMono PRIVATE -DBS_MONO_EXPORTS)
 
 # Libraries
-if(BS_64BIT)
-	set(BS_LOCAL_LIB_PATH ${CMAKE_CURRENT_SOURCE_DIR}/Dependencies/lib/x64)
-else()
-	set(BS_LOCAL_LIB_PATH ${CMAKE_CURRENT_SOURCE_DIR}/Dependencies/lib/x86)
-endif()
-
 ## External lib: Mono
-add_library(Mono STATIC IMPORTED)
-set_target_properties(Mono PROPERTIES IMPORTED_LOCATION_DEBUG ${BS_LIBRARY_DEPENDENCIES_DIR_DEBUG}/mono-2.0${BS_LIBRARY_EXTENSION})
-set_target_properties(Mono PROPERTIES IMPORTED_LOCATION_OPTIMIZEDDEBUG ${BS_LIBRARY_DEPENDENCIES_DIR_OPTIMIZEDEBUG}/mono-2.0${BS_LIBRARY_EXTENSION})
-set_target_properties(Mono PROPERTIES IMPORTED_LOCATION_RELEASE ${BS_LIBRARY_DEPENDENCIES_DIR_RELEASE}/mono-2.0${BS_LIBRARY_EXTENSION})	
-	
-target_link_libraries(BansheeMono Mono)	
+add_library_per_config(BansheeMono mono-2.0)
 
 ## Local libs
-target_link_libraries(BansheeMono BansheeEngine BansheeUtility BansheeCore)
+target_link_libraries(BansheeMono PUBLIC BansheeEngine BansheeUtility BansheeCore)
 
 # IDE specific
 set_property(TARGET BansheeMono PROPERTY FOLDER Plugins)

Source/BansheeOISInput/CMakeLists.txt

@@ -4,10 +4,9 @@ include(CMakeSources.cmake)
 # Includes
 set(BansheeOISInput_INC 
 	"Include"
-	"Dependencies/Include"
 	"../BansheeUtility/Include" 
 	"../BansheeCore/Include"
-	"../../Dependencies/Include")
+	"../../Dependencies/BansheeOISInput/Include")
 
 include_directories(${BansheeOISInput_INC})	
 	
@@ -18,22 +17,11 @@ add_library(BansheeOISInput SHARED ${BS_BANSHEEOISINPUT_SRC})
 target_compile_definitions(BansheeOISInput PRIVATE -DBS_OIS_EXPORTS -DOIS_DYNAMIC_LIB -DOIS_NONCLIENT_BUILD)
 
 # Libraries
-if(BS_64BIT)
-	set(BS_LOCAL_LIB_PATH ${CMAKE_CURRENT_SOURCE_DIR}/Dependencies/lib/x64)
-else()
-	set(BS_LOCAL_LIB_PATH ${CMAKE_CURRENT_SOURCE_DIR}/Dependencies/lib/x86)
-endif()
-
 ## External lib: OIS
-add_library(OIS STATIC IMPORTED)
-set_target_properties(OIS PROPERTIES IMPORTED_LOCATION_DEBUG ${BS_LOCAL_LIB_PATH}/Debug/BansheeOIS${BS_LIBRARY_EXTENSION})
-set_target_properties(OIS PROPERTIES IMPORTED_LOCATION_OPTIMIZEDDEBUG ${BS_LOCAL_LIB_PATH}/OptimizedDebug/BansheeOIS${BS_LIBRARY_EXTENSION})
-set_target_properties(OIS PROPERTIES IMPORTED_LOCATION_RELEASE ${BS_LOCAL_LIB_PATH}/Release/BansheeOIS${BS_LIBRARY_EXTENSION})	
-	
-target_link_libraries(BansheeOISInput OIS)	
+add_library_per_config(BansheeOISInput BansheeOIS)
 
 ## Local libs
-target_link_libraries(BansheeOISInput BansheeUtility BansheeCore)
+target_link_libraries(BansheeOISInput PUBLIC BansheeUtility BansheeCore)
 
 # IDE specific
 set_property(TARGET BansheeOISInput PROPERTY FOLDER Plugins)

Source/BansheePhysX/CMakeLists.txt

@@ -4,7 +4,7 @@ include(CMakeSources.cmake)
 # Includes
 set(BansheePhysX_INC 
 	"Include"
-	"Dependencies/Include"
+	"../../Dependencies/BansheePhysX/Include"
 	"../BansheeUtility/Include" 
 	"../BansheeCore/Include")
 
@@ -18,43 +18,20 @@ target_compile_definitions(BansheePhysX PRIVATE -DBS_PHYSX_EXPORTS)
 
 # Libraries
 if(BS_64BIT)
-	set(BS_LOCAL_LIB_SUFFIX _x64)
-	set(BS_LOCAL_LIB_PATH ${CMAKE_CURRENT_SOURCE_DIR}/Dependencies/lib/x64)
+	set(BS_PHYSX_SUFFIX _x64)
 else()
-	set(BS_LOCAL_LIB_SUFFIX _x86)
-	set(BS_LOCAL_LIB_PATH ${CMAKE_CURRENT_SOURCE_DIR}/Dependencies/lib/x86)
+	set(BS_PHYSX_SUFFIX _x86)
 endif()
 
 ## External lib: PhysX
-add_library(PhysX STATIC IMPORTED)
-set_target_properties(PhysX PROPERTIES IMPORTED_LOCATION_DEBUG ${BS_LOCAL_LIB_PATH}/Debug/PhysX3CHECKED${BS_LOCAL_LIB_SUFFIX}${BS_LIBRARY_EXTENSION})
-set_target_properties(PhysX PROPERTIES IMPORTED_LOCATION_OPTIMIZEDDEBUG ${BS_LOCAL_LIB_PATH}/OptimizedDebug/PhysX3${BS_LOCAL_LIB_SUFFIX}${BS_LIBRARY_EXTENSION})
-set_target_properties(PhysX PROPERTIES IMPORTED_LOCATION_RELEASE ${BS_LOCAL_LIB_PATH}/Release/PhysX3${BS_LOCAL_LIB_SUFFIX}${BS_LIBRARY_EXTENSION})	
-	
-add_library(PhysXCommon STATIC IMPORTED)
-set_target_properties(PhysXCommon PROPERTIES IMPORTED_LOCATION_DEBUG ${BS_LOCAL_LIB_PATH}/Debug/PhysX3CommonCHECKED${BS_LOCAL_LIB_SUFFIX}${BS_LIBRARY_EXTENSION})
-set_target_properties(PhysXCommon PROPERTIES IMPORTED_LOCATION_OPTIMIZEDDEBUG ${BS_LOCAL_LIB_PATH}/OptimizedDebug/PhysX3Common${BS_LOCAL_LIB_SUFFIX}${BS_LIBRARY_EXTENSION})
-set_target_properties(PhysXCommon PROPERTIES IMPORTED_LOCATION_RELEASE ${BS_LOCAL_LIB_PATH}/Release/PhysX3Common${BS_LOCAL_LIB_SUFFIX}${BS_LIBRARY_EXTENSION})
-
-add_library(PhysXCooking STATIC IMPORTED)
-set_target_properties(PhysXCooking PROPERTIES IMPORTED_LOCATION_DEBUG ${BS_LOCAL_LIB_PATH}/Debug/PhysX3CookingCHECKED${BS_LOCAL_LIB_SUFFIX}${BS_LIBRARY_EXTENSION})
-set_target_properties(PhysXCooking PROPERTIES IMPORTED_LOCATION_OPTIMIZEDDEBUG ${BS_LOCAL_LIB_PATH}/OptimizedDebug/PhysX3Cooking${BS_LOCAL_LIB_SUFFIX}${BS_LIBRARY_EXTENSION})
-set_target_properties(PhysXCooking PROPERTIES IMPORTED_LOCATION_RELEASE ${BS_LOCAL_LIB_PATH}/Release/PhysX3Cooking${BS_LOCAL_LIB_SUFFIX}${BS_LIBRARY_EXTENSION})
-
-add_library(PhysXCharacterKinematic STATIC IMPORTED)
-set_target_properties(PhysXCharacterKinematic PROPERTIES IMPORTED_LOCATION_DEBUG ${BS_LOCAL_LIB_PATH}/Debug/PhysX3CharacterKinematicCHECKED${BS_LOCAL_LIB_SUFFIX}${BS_LIBRARY_EXTENSION})
-set_target_properties(PhysXCharacterKinematic PROPERTIES IMPORTED_LOCATION_OPTIMIZEDDEBUG ${BS_LOCAL_LIB_PATH}/OptimizedDebug/PhysX3CharacterKinematic${BS_LOCAL_LIB_SUFFIX}${BS_LIBRARY_EXTENSION})
-set_target_properties(PhysXCharacterKinematic PROPERTIES IMPORTED_LOCATION_RELEASE ${BS_LOCAL_LIB_PATH}/Release/PhysX3CharacterKinematic${BS_LOCAL_LIB_SUFFIX}${BS_LIBRARY_EXTENSION})
-
-add_library(PhysXExtensions STATIC IMPORTED)
-set_target_properties(PhysXExtensions PROPERTIES IMPORTED_LOCATION_DEBUG ${BS_LOCAL_LIB_PATH}/Debug/PhysX3ExtensionsCHECKED${BS_LIBRARY_EXTENSION})
-set_target_properties(PhysXExtensions PROPERTIES IMPORTED_LOCATION_OPTIMIZEDDEBUG ${BS_LOCAL_LIB_PATH}/OptimizedDebug/PhysX3Extensions${BS_LIBRARY_EXTENSION})
-set_target_properties(PhysXExtensions PROPERTIES IMPORTED_LOCATION_RELEASE ${BS_LOCAL_LIB_PATH}/Release/PhysX3Extensions${BS_LIBRARY_EXTENSION})
-	
-target_link_libraries(BansheePhysX PhysX PhysXCommon PhysXCooking PhysXCharacterKinematic PhysXExtensions)	
+add_library_per_config_suffix(BansheePhysX PhysX3 ${BS_PHYSX_SUFFIX} CHECKED${BS_PHYSX_SUFFIX})
+add_library_per_config_suffix(BansheePhysX PhysX3Common ${BS_PHYSX_SUFFIX} CHECKED${BS_PHYSX_SUFFIX})
+add_library_per_config_suffix(BansheePhysX PhysX3Cooking ${BS_PHYSX_SUFFIX} CHECKED${BS_PHYSX_SUFFIX})	
+add_library_per_config_suffix(BansheePhysX PhysX3CharacterKinematic ${BS_PHYSX_SUFFIX} CHECKED${BS_PHYSX_SUFFIX})
+add_library_per_config_suffix(BansheePhysX PhysX3Extensions "" CHECKED)
 
 ## Local libs
-target_link_libraries(BansheePhysX BansheeUtility BansheeCore)
+target_link_libraries(BansheePhysX PUBLIC BansheeUtility BansheeCore)
 
 # IDE specific
 set_property(TARGET BansheePhysX PROPERTY FOLDER Plugins)

Source/BansheeSL/CMakeLists.txt

@@ -6,8 +6,7 @@ set(BansheeSL_INC
 	"Include"
 	"../BansheeUtility/Include" 
 	"../BansheeCore/Include"
-	"../BansheeEngine/Include"
-	"../../Dependencies/Include")
+	"../BansheeEngine/Include")
 
 include_directories(${BansheeSL_INC})	
 	
@@ -17,11 +16,11 @@ add_library(BansheeSL SHARED ${BS_BANSHEESL_SRC})
 # Defines
 target_compile_definitions(BansheeSL PRIVATE -DBS_SL_EXPORTS)
 
-# Pre-built step
+# Pre-build step
 if(WIN32)
 add_custom_command(TARGET BansheeSL PRE_BUILD 
-	COMMAND ../../../Source/BansheeSL/Dependencies/tools/flex/flex.exe --wincompat ../../../Source/BansheeSL/BsLexerFX.l
-	COMMAND ../../../Source/BansheeSL/Dependencies/tools/bison/bison.exe ../../../Source/BansheeSL/BsParserFX.y
+	COMMAND ../../../Dependencies/BansheeSL/tools/flex/flex.exe --wincompat ../../../Source/BansheeSL/BsLexerFX.l
+	COMMAND ../../../Dependencies/BansheeSL/tools/bison/bison.exe ../../../Source/BansheeSL/BsParserFX.y
 	COMMAND xcopy /Y /I BsLexerFX.h \"../../../Source/BansheeSL/Include\"
 	COMMAND xcopy /Y /I BsLexerFX.c \"../../../Source/BansheeSL/Source\"
 	COMMAND xcopy /Y /I BsParserFX.h \"../../../Source/BansheeSL/Include\"

Source/BansheeSL/Include/BsLexerFX.h

@@ -349,7 +349,7 @@ extern int yylex \
 #undef YY_DECL
 #endif
 
-#line 390 "..\\..\\Source\\BansheeSL\\BsLexerFX.l"
+#line 390 "../../../Source/BansheeSL/BsLexerFX.l"
 
 
 #line 356 "BsLexerFX.h"

Source/BansheeSL/Include/BsParserFX.h

@@ -41,7 +41,7 @@ extern int yydebug;
 #endif
 /* "%code requires" blocks.  */
 /* Line 2579 of glr.c  */
-#line 9 "..\\..\\Source\\BansheeSL\\BsParserFX.y"
+#line 9 "../../../Source/BansheeSL/BsParserFX.y"
 
 #include "BsMMAlloc.h"
 #include "BsASTFX.h"
@@ -226,7 +226,7 @@ typedef struct YYLTYPE {
 typedef union YYSTYPE
 {
 /* Line 2579 of glr.c  */
-#line 73 "..\\..\\Source\\BansheeSL\\BsParserFX.y"
+#line 73 "../../../Source/BansheeSL/BsParserFX.y"
 
 	int intValue;
 	float floatValue;

Source/BansheeUtility/CMakeLists.txt

@@ -4,8 +4,7 @@ include(CMakeSources.cmake)
 # Includes
 set(BansheeUtility_INC 
 	"Include" 
-	"Include/ThirdParty" 
-	"../../Dependencies/Include")
+	"Include/ThirdParty")
 
 if(WIN32)
 	set(BansheeUtility_INC ${BansheeUtility_INC} "Include/Win32")
@@ -15,14 +14,6 @@ endif()
 
 include_directories(${BansheeUtility_INC})	
 	
-# Configure file
-#configure_file (
-#  "BsBuildConfig.h.in"
-#  "Generated/BsBuildConfig.h"
-#)
-
-#include_directories ("${CMAKE_CURRENT_BINARY_DIR}/Generated")
-
 # Target
 add_library(BansheeUtility SHARED ${BS_BANSHEEUTILITY_SRC})
 

Source/CMakeLists.txt

@@ -88,16 +88,30 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${BS_LIBRARY_OUTPUT_DIR}/Debug)
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_OPTIMIZEDDEBUG ${BS_LIBRARY_OUTPUT_DIR}/OptimizedDebug)
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${BS_LIBRARY_OUTPUT_DIR}/Release)
 
-set(BS_LIBRARY_DEPENDENCIES_DIR_DEBUG ${PROJECT_SOURCE_DIR}/../Dependencies/lib/${BS_OUTPUT_DIR_PREFIX}/Debug)
-set(BS_LIBRARY_DEPENDENCIES_DIR_OPTIMIZEDDEBUG ${PROJECT_SOURCE_DIR}/../Dependencies/lib/${BS_OUTPUT_DIR_PREFIX}/OptimizedDebug)
-set(BS_LIBRARY_DEPENDENCIES_DIR_RELEASE ${PROJECT_SOURCE_DIR}/../Dependencies/lib/${BS_OUTPUT_DIR_PREFIX}/Release)
-
 if(WIN32)
 	set(BS_LIBRARY_EXTENSION ".lib")
 else()
 	set(BS_LIBRARY_EXTENSION ".a")
 endif()
 
+function(add_library_per_config target_name lib_name)
+	add_library(${lib_name} STATIC IMPORTED)
+	set_target_properties(${lib_name} PROPERTIES IMPORTED_LOCATION_DEBUG ${PROJECT_SOURCE_DIR}/../Dependencies/${target_name}/lib/${BS_OUTPUT_DIR_PREFIX}/Debug/${lib_name}${BS_LIBRARY_EXTENSION})
+	set_target_properties(${lib_name} PROPERTIES IMPORTED_LOCATION_OPTIMIZEDDEBUG ${PROJECT_SOURCE_DIR}/../Dependencies/${target_name}/lib/${BS_OUTPUT_DIR_PREFIX}/OptimizedDebug/${lib_name}${BS_LIBRARY_EXTENSION})
+	set_target_properties(${lib_name} PROPERTIES IMPORTED_LOCATION_RELEASE ${PROJECT_SOURCE_DIR}/../Dependencies/${target_name}/lib/${BS_OUTPUT_DIR_PREFIX}/Release/${lib_name}${BS_LIBRARY_EXTENSION})	
+	
+	target_link_libraries(${target_name} PRIVATE ${lib_name})	
+endfunction()
+
+function(add_library_per_config_suffix target_name lib_name rls_suffix debug_suffix)
+	add_library(${lib_name} STATIC IMPORTED)
+	set_target_properties(${lib_name} PROPERTIES IMPORTED_LOCATION_DEBUG ${PROJECT_SOURCE_DIR}/../Dependencies/${target_name}/lib/${BS_OUTPUT_DIR_PREFIX}/Debug/${lib_name}${debug_suffix}${BS_LIBRARY_EXTENSION})
+	set_target_properties(${lib_name} PROPERTIES IMPORTED_LOCATION_OPTIMIZEDDEBUG ${PROJECT_SOURCE_DIR}/../Dependencies/${target_name}/lib/${BS_OUTPUT_DIR_PREFIX}/OptimizedDebug/${lib_name}${rls_suffix}${BS_LIBRARY_EXTENSION})
+	set_target_properties(${lib_name} PROPERTIES IMPORTED_LOCATION_RELEASE ${PROJECT_SOURCE_DIR}/../Dependencies/${target_name}/lib/${BS_OUTPUT_DIR_PREFIX}/Release/${lib_name}${rls_suffix}${BS_LIBRARY_EXTENSION})	
+	
+	target_link_libraries(${target_name} PRIVATE ${lib_name})	
+endfunction()
+
 set_property(GLOBAL PROPERTY USE_FOLDERS TRUE)
 
 # Sub-directories

Source/ExampleProject/CMakeLists.txt

@@ -6,8 +6,7 @@ set(ExampleProject_INC
 	"Include"
 	"../BansheeUtility/Include" 
 	"../BansheeCore/Include"
-	"../BansheeEngine/Include"
-	"../../Dependencies/Include")
+	"../BansheeEngine/Include")
 
 include_directories(${ExampleProject_INC})	
 	

Source/Game/CMakeLists.txt

@@ -6,14 +6,28 @@ set(Game_INC
 	"Include"
 	"../BansheeUtility/Include" 
 	"../BansheeCore/Include"
-	"../BansheeEngine/Include"
-	"../../Dependencies/Include")
+	"../BansheeEngine/Include")
 
 include_directories(${Game_INC})	
 	
 # Target
 add_library(Game SHARED ${BS_GAME_SRC})
 
+# Post-build step
+if(WIN32)
+	if(BS_64BIT)
+		set(BS_COPY_FOLDER Win64)
+	else()
+		set(BS_COPY_FOLDER Win32)
+	endif()
+
+	add_custom_command(TARGET Game POST_BUILD 
+		COMMAND xcopy /Y /I \"$(TargetDir)$(TargetName).exe\" \"$(SolutionDir)..\\..\\Data\\Binaries\\${BS_COPY_FOLDER}\\\"
+)
+else()
+# TODO_OTHER_PLATFORMS_GO_HERE
+endif()
+
 # Libraries
 ## Local libs
 target_link_libraries(Game BansheeEngine BansheeUtility BansheeCore)

Source/RenderBeast/CMakeLists.txt

@@ -6,8 +6,7 @@ set(RenderBeast_INC
 	"Include"
 	"../BansheeUtility/Include" 
 	"../BansheeCore/Include"
-	"../BansheeEngine/Include"
-	"../../Dependencies/Include")
+	"../BansheeEngine/Include")
 
 include_directories(${RenderBeast_INC})	
 	

Source/SBansheeEditor/CMakeLists.txt

@@ -9,8 +9,7 @@ set(SBansheeEditor_INC
 	"../BansheeEngine/Include"
 	"../BansheeEditor/Include"
 	"../BansheeMono/Include"
-	"../SBansheeEngine/Include"
-	"../../Dependencies/Include")
+	"../SBansheeEngine/Include")
 
 include_directories(${SBansheeEditor_INC})	
 	

Source/SBansheeEngine/CMakeLists.txt

@@ -8,8 +8,7 @@ set(SBansheeEngine_INC
 	"../BansheeCore/Include"
 	"../BansheeEngine/Include"
 	"../BansheeEditor/Include"
-	"../BansheeMono/Include"
-	"../../Dependencies/Include")
+	"../BansheeMono/Include")
 
 include_directories(${SBansheeEngine_INC})