diff options
Diffstat (limited to 'samples/compiler/cmake/windows')
| -rwxr-xr-x[-rw-r--r--] | samples/compiler/cmake/windows/CMakeLists.txt | 104 | ||||
| -rwxr-xr-x[-rw-r--r--] | samples/compiler/cmake/windows/SampleAssetViewer-AT.cmake | 14 | ||||
| -rwxr-xr-x[-rw-r--r--] | samples/compiler/cmake/windows/SampleAssetViewer.cmake | 42 | ||||
| -rwxr-xr-x[-rw-r--r--] | samples/compiler/cmake/windows/SampleBase-AT.cmake | 14 | ||||
| -rwxr-xr-x[-rw-r--r--] | samples/compiler/cmake/windows/SampleBase.cmake | 42 |
5 files changed, 108 insertions, 108 deletions
diff --git a/samples/compiler/cmake/windows/CMakeLists.txt b/samples/compiler/cmake/windows/CMakeLists.txt index 3d007ea..cf7362a 100644..100755 --- a/samples/compiler/cmake/windows/CMakeLists.txt +++ b/samples/compiler/cmake/windows/CMakeLists.txt @@ -1,52 +1,52 @@ -#Platform specific compile flags and project includes - -#NOTE: Warnings lowered on the sample projects as it's got a lot of warnings. Defines below hide more. -SET(CMAKE_CXX_FLAGS "/GR- /GF /MP /Gy /EHsc /d2Zi+ /errorReport:prompt /fp:fast /Gd /Gm- /GS- /nologo /W3 /WX /Zc:forScope /Zc:inline /Zc:wchar_t /Zi") - -# Are we using the static or dynamic RT library? Whatever we use, it needs to be the same in any dependencies -# we pull in or we're potentially having mismatch issues. -IF(STATIC_WINCRT) - SET(WINCRT_NDEBUG "/MT") - SET(WINCRT_DEBUG "/MTd") -ELSE() - SET(WINCRT_NDEBUG "/MD") - SET(WINCRT_DEBUG "/MDd") -ENDIF() - -SET(CMAKE_CXX_FLAGS_DEBUG "/Od /RTCsu ${WINCRT_DEBUG}") -SET(CMAKE_CXX_FLAGS_CHECKED "/Ox ${WINCRT_NDEBUG}") -SET(CMAKE_CXX_FLAGS_PROFILE "/Ox ${WINCRT_NDEBUG}") -SET(CMAKE_CXX_FLAGS_RELEASE "/Ox ${WINCRT_NDEBUG}") - -# Build PDBs for all configurations -SET(CMAKE_SHARED_LINKER_FLAGS "/DEBUG") - -IF(CMAKE_CL_64) - ADD_DEFINITIONS(-DWIN64) -ENDIF(CMAKE_CL_64) - -SET(SAMPLES_SLN_COMPILE_DEFS _UNICODE;UNICODE;WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_RUNTIME_LIBRARY_MISMATCH;__GFSDK_DX11__;) -#NvBlastExt doesn't have the _CONSOLE flag - -SET(SAMPLES_SLN_DEBUG_COMPILE_DEFS _DEBUG;NV_DEBUG=1;NV_NVTX=1;) -SET(SAMPLES_SLN_CHECKED_COMPILE_DEFS NDEBUG;NV_CHECKED=1;NV_NVTX=1;) -SET(SAMPLES_SLN_PROFILE_COMPILE_DEFS NDEBUG;NV_PROFILE=1;NV_NVTX=1;) -SET(SAMPLES_SLN_RELEASE_COMPILE_DEFS NDEBUG;) - -IF(CMAKE_CL_64) - SET(LIBPATH_SUFFIX "x64") -ELSE(CMAKE_CL_64) - SET(LIBPATH_SUFFIX "x86") -ENDIF(CMAKE_CL_64) - -SET(CMAKE_DEBUG_POSTFIX "${CMAKE_DEBUG_POSTFIX}_${LIBPATH_SUFFIX}") -SET(CMAKE_PROFILE_POSTFIX "${CMAKE_PROFILE_POSTFIX}_${LIBPATH_SUFFIX}") -SET(CMAKE_CHECKED_POSTFIX "${CMAKE_CHECKED_POSTFIX}_${LIBPATH_SUFFIX}") -SET(CMAKE_RELEASE_POSTFIX "${CMAKE_RELEASE_POSTFIX}_${LIBPATH_SUFFIX}") - - -# Include all of the projects -INCLUDE(${PROJECT_CMAKE_FILES_DIR}/SampleBase.cmake) -INCLUDE(${PROJECT_CMAKE_FILES_DIR}/SampleAssetViewer.cmake) - - +#Platform specific compile flags and project includes
+
+#NOTE: Warnings lowered on the sample projects as it's got a lot of warnings. Defines below hide more.
+SET(CMAKE_CXX_FLAGS "/GR- /GF /MP /Gy /EHsc /d2Zi+ /errorReport:prompt /fp:fast /Gd /Gm- /GS- /nologo /W3 /WX /Zc:forScope /Zc:inline /Zc:wchar_t /Zi")
+
+# Are we using the static or dynamic RT library? Whatever we use, it needs to be the same in any dependencies
+# we pull in or we're potentially having mismatch issues.
+IF(STATIC_WINCRT)
+ SET(WINCRT_NDEBUG "/MT")
+ SET(WINCRT_DEBUG "/MTd")
+ELSE()
+ SET(WINCRT_NDEBUG "/MD")
+ SET(WINCRT_DEBUG "/MDd")
+ENDIF()
+
+SET(CMAKE_CXX_FLAGS_DEBUG "/Od /RTCsu ${WINCRT_DEBUG}")
+SET(CMAKE_CXX_FLAGS_CHECKED "/Ox ${WINCRT_NDEBUG}")
+SET(CMAKE_CXX_FLAGS_PROFILE "/Ox ${WINCRT_NDEBUG}")
+SET(CMAKE_CXX_FLAGS_RELEASE "/Ox ${WINCRT_NDEBUG}")
+
+# Build PDBs for all configurations
+SET(CMAKE_SHARED_LINKER_FLAGS "/DEBUG")
+
+IF(CMAKE_CL_64)
+ ADD_DEFINITIONS(-DWIN64)
+ENDIF(CMAKE_CL_64)
+
+SET(SAMPLES_SLN_COMPILE_DEFS _UNICODE;UNICODE;WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_RUNTIME_LIBRARY_MISMATCH;__GFSDK_DX11__;)
+#NvBlastExt doesn't have the _CONSOLE flag
+
+SET(SAMPLES_SLN_DEBUG_COMPILE_DEFS _DEBUG;NV_DEBUG=1;NV_NVTX=1;)
+SET(SAMPLES_SLN_CHECKED_COMPILE_DEFS NDEBUG;NV_CHECKED=1;NV_NVTX=1;)
+SET(SAMPLES_SLN_PROFILE_COMPILE_DEFS NDEBUG;NV_PROFILE=1;NV_NVTX=1;)
+SET(SAMPLES_SLN_RELEASE_COMPILE_DEFS NDEBUG;)
+
+IF(CMAKE_CL_64)
+ SET(LIBPATH_SUFFIX "x64")
+ELSE(CMAKE_CL_64)
+ SET(LIBPATH_SUFFIX "x86")
+ENDIF(CMAKE_CL_64)
+
+SET(CMAKE_DEBUG_POSTFIX "${CMAKE_DEBUG_POSTFIX}_${LIBPATH_SUFFIX}")
+SET(CMAKE_PROFILE_POSTFIX "${CMAKE_PROFILE_POSTFIX}_${LIBPATH_SUFFIX}")
+SET(CMAKE_CHECKED_POSTFIX "${CMAKE_CHECKED_POSTFIX}_${LIBPATH_SUFFIX}")
+SET(CMAKE_RELEASE_POSTFIX "${CMAKE_RELEASE_POSTFIX}_${LIBPATH_SUFFIX}")
+
+
+# Include all of the projects
+INCLUDE(${PROJECT_CMAKE_FILES_DIR}/SampleBase.cmake)
+INCLUDE(${PROJECT_CMAKE_FILES_DIR}/SampleAssetViewer.cmake)
+
+
diff --git a/samples/compiler/cmake/windows/SampleAssetViewer-AT.cmake b/samples/compiler/cmake/windows/SampleAssetViewer-AT.cmake index d0defc9..a1bdc62 100644..100755 --- a/samples/compiler/cmake/windows/SampleAssetViewer-AT.cmake +++ b/samples/compiler/cmake/windows/SampleAssetViewer-AT.cmake @@ -1,7 +1,7 @@ -# Copy the dlls from the deps - -ADD_CUSTOM_COMMAND(TARGET SampleAssetViewer POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${PXSHAREDSDK_DLLS} ${PHYSXSDK_DLLS} - ${BL_EXE_OUTPUT_DIR} -) +# Copy the dlls from the deps
+
+ADD_CUSTOM_COMMAND(TARGET SampleAssetViewer POST_BUILD
+ COMMAND ${CMAKE_COMMAND} -E copy_if_different
+ ${PXSHAREDSDK_DLLS} ${PHYSXSDK_DLLS}
+ ${BL_EXE_OUTPUT_DIR}
+)
diff --git a/samples/compiler/cmake/windows/SampleAssetViewer.cmake b/samples/compiler/cmake/windows/SampleAssetViewer.cmake index 20b9f67..6588e51 100644..100755 --- a/samples/compiler/cmake/windows/SampleAssetViewer.cmake +++ b/samples/compiler/cmake/windows/SampleAssetViewer.cmake @@ -1,21 +1,21 @@ -# -# Build SampleAssetViewer Windows -# - -SET(SAMPLEASSETVIEWER_PLATFORM_COMMON_FILES -) - -SET(SAMPLEASSETVIEWER_PLATFORM_INCLUDES -) - -SET(SAMPLEASSETVIEWER_COMPILE_DEFS - # Common to all configurations - ${SAMPLES_SLN_COMPILE_DEFS} - - $<$<CONFIG:debug>:${SAMPLES_SLN_DEBUG_COMPILE_DEFS}> - $<$<CONFIG:checked>:${SAMPLES_SLN_CHECKED_COMPILE_DEFS}> - $<$<CONFIG:profile>:${SAMPLES_SLN_PROFILE_COMPILE_DEFS}> - $<$<CONFIG:release>:${SAMPLES_SLN_RELEASE_COMPILE_DEFS}> -) - -SET(SAMPLEASSETVIEWER_LINK_FLAGS "/SUBSYSTEM:WINDOWS") +#
+# Build SampleAssetViewer Windows
+#
+
+SET(SAMPLEASSETVIEWER_PLATFORM_COMMON_FILES
+)
+
+SET(SAMPLEASSETVIEWER_PLATFORM_INCLUDES
+)
+
+SET(SAMPLEASSETVIEWER_COMPILE_DEFS
+ # Common to all configurations
+ ${SAMPLES_SLN_COMPILE_DEFS}
+
+ $<$<CONFIG:debug>:${SAMPLES_SLN_DEBUG_COMPILE_DEFS}>
+ $<$<CONFIG:checked>:${SAMPLES_SLN_CHECKED_COMPILE_DEFS}>
+ $<$<CONFIG:profile>:${SAMPLES_SLN_PROFILE_COMPILE_DEFS}>
+ $<$<CONFIG:release>:${SAMPLES_SLN_RELEASE_COMPILE_DEFS}>
+)
+
+SET(SAMPLEASSETVIEWER_LINK_FLAGS "/SUBSYSTEM:WINDOWS")
diff --git a/samples/compiler/cmake/windows/SampleBase-AT.cmake b/samples/compiler/cmake/windows/SampleBase-AT.cmake index 80fa0a5..b568350 100644..100755 --- a/samples/compiler/cmake/windows/SampleBase-AT.cmake +++ b/samples/compiler/cmake/windows/SampleBase-AT.cmake @@ -1,7 +1,7 @@ -# Copy the dlls from the deps - -ADD_CUSTOM_COMMAND(TARGET SampleBase POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${PXSHAREDSDK_DLLS} ${PHYSXSDK_DLLS} ${SHADOW_LIB_DLL} ${HBAO_PLUS_DLL} ${D3DCOMPILER_DLL} ${NVTOOLSEXT_DLL} - ${BL_EXE_OUTPUT_DIR} -) +# Copy the dlls from the deps
+
+ADD_CUSTOM_COMMAND(TARGET SampleBase POST_BUILD
+ COMMAND ${CMAKE_COMMAND} -E copy_if_different
+ ${PXSHAREDSDK_DLLS} ${PHYSXSDK_DLLS} ${SHADOW_LIB_DLL} ${HBAO_PLUS_DLL} ${D3DCOMPILER_DLL} ${NVTOOLSEXT_DLL}
+ ${BL_EXE_OUTPUT_DIR}
+)
diff --git a/samples/compiler/cmake/windows/SampleBase.cmake b/samples/compiler/cmake/windows/SampleBase.cmake index 19133c4..48eef00 100644..100755 --- a/samples/compiler/cmake/windows/SampleBase.cmake +++ b/samples/compiler/cmake/windows/SampleBase.cmake @@ -1,21 +1,21 @@ -# -# Build SampleBase Windows -# - -SET(SAMPLEBASE_PLATFORM_COMMON_FILES -) - -SET(SAMPLEBASE_PLATFORM_INCLUDES -) - -SET(SAMPLEBASE_COMPILE_DEFS - # Common to all configurations - ${SAMPLES_SLN_COMPILE_DEFS} - - $<$<CONFIG:debug>:${SAMPLES_SLN_DEBUG_COMPILE_DEFS}> - $<$<CONFIG:checked>:${SAMPLES_SLN_CHECKED_COMPILE_DEFS}> - $<$<CONFIG:profile>:${SAMPLES_SLN_PROFILE_COMPILE_DEFS}> - $<$<CONFIG:release>:${SAMPLES_SLN_RELEASE_COMPILE_DEFS}> -) - -SET(SAMPLEBASE_ADDITIONAL_DLLS "") +#
+# Build SampleBase Windows
+#
+
+SET(SAMPLEBASE_PLATFORM_COMMON_FILES
+)
+
+SET(SAMPLEBASE_PLATFORM_INCLUDES
+)
+
+SET(SAMPLEBASE_COMPILE_DEFS
+ # Common to all configurations
+ ${SAMPLES_SLN_COMPILE_DEFS}
+
+ $<$<CONFIG:debug>:${SAMPLES_SLN_DEBUG_COMPILE_DEFS}>
+ $<$<CONFIG:checked>:${SAMPLES_SLN_CHECKED_COMPILE_DEFS}>
+ $<$<CONFIG:profile>:${SAMPLES_SLN_PROFILE_COMPILE_DEFS}>
+ $<$<CONFIG:release>:${SAMPLES_SLN_RELEASE_COMPILE_DEFS}>
+)
+
+SET(SAMPLEBASE_ADDITIONAL_DLLS "")
|