From 7115f60b91b5717d90f643fd692010905c7004db Mon Sep 17 00:00:00 2001 From: Bryan Galdrikian Date: Thu, 31 May 2018 11:36:08 -0700 Subject: Blast 1.1.3. See docs/release_notes.txt. --- sdk/compiler/cmake/windows/CMakeLists.txt | 132 ++++++++++----------- sdk/compiler/cmake/windows/NvBlast.cmake | 44 +++---- .../cmake/windows/NvBlastExtAssetUtils.cmake | 52 ++++---- .../cmake/windows/NvBlastExtAuthoring.cmake | 48 ++++---- .../cmake/windows/NvBlastExtExporter.cmake | 60 +++++----- sdk/compiler/cmake/windows/NvBlastExtImport.cmake | 48 ++++---- sdk/compiler/cmake/windows/NvBlastExtPhysX.cmake | 48 ++++---- .../cmake/windows/NvBlastExtPxSerialization.cmake | 52 ++++---- .../cmake/windows/NvBlastExtSerialization.cmake | 52 ++++---- sdk/compiler/cmake/windows/NvBlastExtShaders.cmake | 48 ++++---- .../cmake/windows/NvBlastExtTkSerialization.cmake | 52 ++++---- sdk/compiler/cmake/windows/NvBlastGlobals.cmake | 26 ++-- sdk/compiler/cmake/windows/NvBlastTk.cmake | 48 ++++---- 13 files changed, 355 insertions(+), 355 deletions(-) mode change 100644 => 100755 sdk/compiler/cmake/windows/CMakeLists.txt mode change 100644 => 100755 sdk/compiler/cmake/windows/NvBlast.cmake mode change 100644 => 100755 sdk/compiler/cmake/windows/NvBlastExtAssetUtils.cmake mode change 100644 => 100755 sdk/compiler/cmake/windows/NvBlastExtAuthoring.cmake mode change 100644 => 100755 sdk/compiler/cmake/windows/NvBlastExtExporter.cmake mode change 100644 => 100755 sdk/compiler/cmake/windows/NvBlastExtImport.cmake mode change 100644 => 100755 sdk/compiler/cmake/windows/NvBlastExtPhysX.cmake mode change 100644 => 100755 sdk/compiler/cmake/windows/NvBlastExtPxSerialization.cmake mode change 100644 => 100755 sdk/compiler/cmake/windows/NvBlastExtSerialization.cmake mode change 100644 => 100755 sdk/compiler/cmake/windows/NvBlastExtShaders.cmake mode change 100644 => 100755 sdk/compiler/cmake/windows/NvBlastExtTkSerialization.cmake mode change 100644 => 100755 sdk/compiler/cmake/windows/NvBlastGlobals.cmake mode change 100644 => 100755 sdk/compiler/cmake/windows/NvBlastTk.cmake (limited to 'sdk/compiler/cmake/windows') diff --git a/sdk/compiler/cmake/windows/CMakeLists.txt b/sdk/compiler/cmake/windows/CMakeLists.txt old mode 100644 new mode 100755 index 4c31d6a..e3fbaed --- a/sdk/compiler/cmake/windows/CMakeLists.txt +++ b/sdk/compiler/cmake/windows/CMakeLists.txt @@ -1,66 +1,66 @@ -#Platform specific compile flags and project includes - -SET(CMAKE_CXX_FLAGS "/GR- /GF /MP /Gy /d2Zi+ /errorReport:prompt /fp:fast /Gd /Gm- /GS- /nologo /W4 /WX /Zc:forScope /Zc:inline /Zc:wchar_t /Zi") - -OPTION(STATIC_WINCRT "Use static WinCRT" OFF) - -# 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}") - -MESSAGE("STATIC OR DYN: ${WINCRT_DEBUG}") - -# Build PDBs for all configurations -SET(CMAKE_SHARED_LINKER_FLAGS "/DEBUG") - -IF(CMAKE_CL_64) - ADD_DEFINITIONS(-DWIN64) -ENDIF(CMAKE_CL_64) - -SET(BLAST_SLN_COMPILE_DEFS _HAS_EXCEPTIONS=0;WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;) -#NvBlastExt doesn't have the _CONSOLE flag - -SET(BLAST_SLN_DEBUG_COMPILE_DEFS _DEBUG;NV_DEBUG=1;) -SET(BLAST_SLN_CHECKED_COMPILE_DEFS NDEBUG;NV_CHECKED=1;) -SET(BLAST_SLN_PROFILE_COMPILE_DEFS NDEBUG;NV_PROFILE=1;) -SET(BLAST_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}/NvBlast.cmake) -INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastGlobals.cmake) -INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastTk.cmake) -INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtShaders.cmake) -INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtStress.cmake) -INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtPhysX.cmake) -INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtAuthoring.cmake) -INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtImport.cmake) -INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtAssetUtils.cmake) -INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtExporter.cmake) - -SET(SERIALIZATION_INCLUDED 1 PARENT_SCOPE) -INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtSerialization.cmake) -INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtTkSerialization.cmake) -INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtPxSerialization.cmake) +#Platform specific compile flags and project includes + +SET(CMAKE_CXX_FLAGS "/GR- /GF /MP /Gy /d2Zi+ /errorReport:prompt /fp:fast /Gd /Gm- /GS- /nologo /W4 /WX /Zc:forScope /Zc:inline /Zc:wchar_t /Zi") + +OPTION(STATIC_WINCRT "Use static WinCRT" OFF) + +# 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}") + +MESSAGE("STATIC OR DYN: ${WINCRT_DEBUG}") + +# Build PDBs for all configurations +SET(CMAKE_SHARED_LINKER_FLAGS "/DEBUG") + +IF(CMAKE_CL_64) + ADD_DEFINITIONS(-DWIN64) +ENDIF(CMAKE_CL_64) + +SET(BLAST_SLN_COMPILE_DEFS _HAS_EXCEPTIONS=0;WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;) +#NvBlastExt doesn't have the _CONSOLE flag + +SET(BLAST_SLN_DEBUG_COMPILE_DEFS _DEBUG;NV_DEBUG=1;) +SET(BLAST_SLN_CHECKED_COMPILE_DEFS NDEBUG;NV_CHECKED=1;) +SET(BLAST_SLN_PROFILE_COMPILE_DEFS NDEBUG;NV_PROFILE=1;) +SET(BLAST_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}/NvBlast.cmake) +INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastGlobals.cmake) +INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastTk.cmake) +INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtShaders.cmake) +INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtStress.cmake) +INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtPhysX.cmake) +INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtAuthoring.cmake) +INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtImport.cmake) +INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtAssetUtils.cmake) +INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtExporter.cmake) + +SET(SERIALIZATION_INCLUDED 1 PARENT_SCOPE) +INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtSerialization.cmake) +INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtTkSerialization.cmake) +INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtPxSerialization.cmake) diff --git a/sdk/compiler/cmake/windows/NvBlast.cmake b/sdk/compiler/cmake/windows/NvBlast.cmake old mode 100644 new mode 100755 index 64b6b02..8b57642 --- a/sdk/compiler/cmake/windows/NvBlast.cmake +++ b/sdk/compiler/cmake/windows/NvBlast.cmake @@ -1,22 +1,22 @@ -# -# Build NvBlast Windows -# - -SET(BLAST_PLATFORM_COMMON_FILES - ${COMMON_SOURCE_DIR}/NvBlastIncludeWindows.h -) - -SET(BLAST_PLATFORM_INCLUDES -) - -SET(BLAST_COMPILE_DEFS - # Common to all configurations - ${BLAST_SLN_COMPILE_DEFS};_CONSOLE - - $<$:${BLAST_SLN_DEBUG_COMPILE_DEFS}> - $<$:${BLAST_SLN_CHECKED_COMPILE_DEFS}> - $<$:${BLAST_SLN_PROFILE_COMPILE_DEFS}> - $<$:${BLAST_SLN_RELEASE_COMPILE_DEFS}> -) - -SET(BLAST_LIB_TYPE SHARED) +# +# Build NvBlast Windows +# + +SET(BLAST_PLATFORM_COMMON_FILES + ${COMMON_SOURCE_DIR}/NvBlastIncludeWindows.h +) + +SET(BLAST_PLATFORM_INCLUDES +) + +SET(BLAST_COMPILE_DEFS + # Common to all configurations + ${BLAST_SLN_COMPILE_DEFS};_CONSOLE + + $<$:${BLAST_SLN_DEBUG_COMPILE_DEFS}> + $<$:${BLAST_SLN_CHECKED_COMPILE_DEFS}> + $<$:${BLAST_SLN_PROFILE_COMPILE_DEFS}> + $<$:${BLAST_SLN_RELEASE_COMPILE_DEFS}> +) + +SET(BLAST_LIB_TYPE SHARED) diff --git a/sdk/compiler/cmake/windows/NvBlastExtAssetUtils.cmake b/sdk/compiler/cmake/windows/NvBlastExtAssetUtils.cmake old mode 100644 new mode 100755 index 77c51b4..601110f --- a/sdk/compiler/cmake/windows/NvBlastExtAssetUtils.cmake +++ b/sdk/compiler/cmake/windows/NvBlastExtAssetUtils.cmake @@ -1,26 +1,26 @@ -# -# Build NvBlastExtAssetUtils Windows -# - -SET(BLASTEXTASSETUTILS_PLATFORM_COMMON_FILES - ${COMMON_SOURCE_DIR}/NvBlastIncludeWindows.h -) - -SET(BLASTEXTASSETUTILS_PLATFORM_INCLUDES -) - -SET(BLASTEXTASSETUTILS_COMPILE_DEFS - # Common to all configurations - ${BLAST_SLN_COMPILE_DEFS};_CONSOLE; - - $<$:${BLAST_SLN_DEBUG_COMPILE_DEFS}> - $<$:${BLAST_SLN_CHECKED_COMPILE_DEFS}> - $<$:${BLAST_SLN_PROFILE_COMPILE_DEFS}> - $<$:${BLAST_SLN_RELEASE_COMPILE_DEFS}> -) - -SET(BLASTEXTASSETUTILS_LIB_TYPE SHARED) - - -SET(BLASTEXTASSETUTILS_COMPILE_OPTIONS "/wd4100;/wd4239;/wd4244;/wd4245;/wd4267;/EHsc") - +# +# Build NvBlastExtAssetUtils Windows +# + +SET(BLASTEXTASSETUTILS_PLATFORM_COMMON_FILES + ${COMMON_SOURCE_DIR}/NvBlastIncludeWindows.h +) + +SET(BLASTEXTASSETUTILS_PLATFORM_INCLUDES +) + +SET(BLASTEXTASSETUTILS_COMPILE_DEFS + # Common to all configurations + ${BLAST_SLN_COMPILE_DEFS};_CONSOLE; + + $<$:${BLAST_SLN_DEBUG_COMPILE_DEFS}> + $<$:${BLAST_SLN_CHECKED_COMPILE_DEFS}> + $<$:${BLAST_SLN_PROFILE_COMPILE_DEFS}> + $<$:${BLAST_SLN_RELEASE_COMPILE_DEFS}> +) + +SET(BLASTEXTASSETUTILS_LIB_TYPE SHARED) + + +SET(BLASTEXTASSETUTILS_COMPILE_OPTIONS "/wd4100;/wd4239;/wd4244;/wd4245;/wd4267;/EHsc") + diff --git a/sdk/compiler/cmake/windows/NvBlastExtAuthoring.cmake b/sdk/compiler/cmake/windows/NvBlastExtAuthoring.cmake old mode 100644 new mode 100755 index 7406d74..6fb4410 --- a/sdk/compiler/cmake/windows/NvBlastExtAuthoring.cmake +++ b/sdk/compiler/cmake/windows/NvBlastExtAuthoring.cmake @@ -1,24 +1,24 @@ -# -# Build NvBlastExt Windows -# - -SET(BLASTEXT_PLATFORM_COMMON_FILES - ${COMMON_SOURCE_DIR}/NvBlastIncludeWindows.h -) - -SET(BLASTEXT_PLATFORM_INCLUDES -) - -SET(BLASTEXT_COMPILE_DEFS - # Common to all configurations - ${BLAST_SLN_COMPILE_DEFS};_CONSOLE; - - $<$:${BLAST_SLN_DEBUG_COMPILE_DEFS}> - $<$:${BLAST_SLN_CHECKED_COMPILE_DEFS}> - $<$:${BLAST_SLN_PROFILE_COMPILE_DEFS}> - $<$:${BLAST_SLN_RELEASE_COMPILE_DEFS}> -) - -SET(BLAST_EXT_SHARED_LIB_TYPE SHARED) - -SET(BLASTEXT_PLATFORM_COMPILE_OPTIONS "/wd4100;/wd4239;/wd4244;/wd4245;/wd4267;/EHsc") +# +# Build NvBlastExt Windows +# + +SET(BLASTEXT_PLATFORM_COMMON_FILES + ${COMMON_SOURCE_DIR}/NvBlastIncludeWindows.h +) + +SET(BLASTEXT_PLATFORM_INCLUDES +) + +SET(BLASTEXT_COMPILE_DEFS + # Common to all configurations + ${BLAST_SLN_COMPILE_DEFS};_CONSOLE; + + $<$:${BLAST_SLN_DEBUG_COMPILE_DEFS}> + $<$:${BLAST_SLN_CHECKED_COMPILE_DEFS}> + $<$:${BLAST_SLN_PROFILE_COMPILE_DEFS}> + $<$:${BLAST_SLN_RELEASE_COMPILE_DEFS}> +) + +SET(BLAST_EXT_SHARED_LIB_TYPE SHARED) + +SET(BLASTEXT_PLATFORM_COMPILE_OPTIONS "/wd4100;/wd4239;/wd4244;/wd4245;/wd4267;/EHsc") diff --git a/sdk/compiler/cmake/windows/NvBlastExtExporter.cmake b/sdk/compiler/cmake/windows/NvBlastExtExporter.cmake old mode 100644 new mode 100755 index 33f720d..b9487d8 --- a/sdk/compiler/cmake/windows/NvBlastExtExporter.cmake +++ b/sdk/compiler/cmake/windows/NvBlastExtExporter.cmake @@ -1,30 +1,30 @@ -# -# Build NvBlastExt Windows -# - -SET(BLASTEXT_PLATFORM_COMMON_FILES - ${COMMON_SOURCE_DIR}/NvBlastIncludeWindows.h -) - -SET(BLASTEXT_PLATFORM_INCLUDES -) - -SET(BLASTEXT_COMPILE_DEFS - # Common to all configurations - ${BLAST_SLN_COMPILE_DEFS};_CONSOLE; - - $<$:${BLAST_SLN_DEBUG_COMPILE_DEFS}> - $<$:${BLAST_SLN_CHECKED_COMPILE_DEFS}> - $<$:${BLAST_SLN_PROFILE_COMPILE_DEFS}> - $<$:${BLAST_SLN_RELEASE_COMPILE_DEFS}> -) - -SET(BLAST_EXT_SHARED_LIB_TYPE SHARED) - -SET(BLASTEXT_PLATFORM_COMPILE_OPTIONS "/wd4100;/wd4239;/wd4244;/wd4245;/wd4267;/EHsc") - -#VS2013 has a unreacable code warning in the STL (xtree) -IF(MSVC_VERSION LESS 1900) - SET(BLASTEXT_PLATFORM_COMPILE_OPTIONS "${BLASTEXT_PLATFORM_COMPILE_OPTIONS};/wd4702") -ENDIF() - +# +# Build NvBlastExt Windows +# + +SET(BLASTEXT_PLATFORM_COMMON_FILES + ${COMMON_SOURCE_DIR}/NvBlastIncludeWindows.h +) + +SET(BLASTEXT_PLATFORM_INCLUDES +) + +SET(BLASTEXT_COMPILE_DEFS + # Common to all configurations + ${BLAST_SLN_COMPILE_DEFS};_CONSOLE; + + $<$:${BLAST_SLN_DEBUG_COMPILE_DEFS}> + $<$:${BLAST_SLN_CHECKED_COMPILE_DEFS}> + $<$:${BLAST_SLN_PROFILE_COMPILE_DEFS}> + $<$:${BLAST_SLN_RELEASE_COMPILE_DEFS}> +) + +SET(BLAST_EXT_SHARED_LIB_TYPE SHARED) + +SET(BLASTEXT_PLATFORM_COMPILE_OPTIONS "/wd4100;/wd4239;/wd4244;/wd4245;/wd4267;/EHsc") + +#VS2013 has a unreacable code warning in the STL (xtree) +IF(MSVC_VERSION LESS 1900) + SET(BLASTEXT_PLATFORM_COMPILE_OPTIONS "${BLASTEXT_PLATFORM_COMPILE_OPTIONS};/wd4702") +ENDIF() + diff --git a/sdk/compiler/cmake/windows/NvBlastExtImport.cmake b/sdk/compiler/cmake/windows/NvBlastExtImport.cmake old mode 100644 new mode 100755 index 7406d74..6fb4410 --- a/sdk/compiler/cmake/windows/NvBlastExtImport.cmake +++ b/sdk/compiler/cmake/windows/NvBlastExtImport.cmake @@ -1,24 +1,24 @@ -# -# Build NvBlastExt Windows -# - -SET(BLASTEXT_PLATFORM_COMMON_FILES - ${COMMON_SOURCE_DIR}/NvBlastIncludeWindows.h -) - -SET(BLASTEXT_PLATFORM_INCLUDES -) - -SET(BLASTEXT_COMPILE_DEFS - # Common to all configurations - ${BLAST_SLN_COMPILE_DEFS};_CONSOLE; - - $<$:${BLAST_SLN_DEBUG_COMPILE_DEFS}> - $<$:${BLAST_SLN_CHECKED_COMPILE_DEFS}> - $<$:${BLAST_SLN_PROFILE_COMPILE_DEFS}> - $<$:${BLAST_SLN_RELEASE_COMPILE_DEFS}> -) - -SET(BLAST_EXT_SHARED_LIB_TYPE SHARED) - -SET(BLASTEXT_PLATFORM_COMPILE_OPTIONS "/wd4100;/wd4239;/wd4244;/wd4245;/wd4267;/EHsc") +# +# Build NvBlastExt Windows +# + +SET(BLASTEXT_PLATFORM_COMMON_FILES + ${COMMON_SOURCE_DIR}/NvBlastIncludeWindows.h +) + +SET(BLASTEXT_PLATFORM_INCLUDES +) + +SET(BLASTEXT_COMPILE_DEFS + # Common to all configurations + ${BLAST_SLN_COMPILE_DEFS};_CONSOLE; + + $<$:${BLAST_SLN_DEBUG_COMPILE_DEFS}> + $<$:${BLAST_SLN_CHECKED_COMPILE_DEFS}> + $<$:${BLAST_SLN_PROFILE_COMPILE_DEFS}> + $<$:${BLAST_SLN_RELEASE_COMPILE_DEFS}> +) + +SET(BLAST_EXT_SHARED_LIB_TYPE SHARED) + +SET(BLASTEXT_PLATFORM_COMPILE_OPTIONS "/wd4100;/wd4239;/wd4244;/wd4245;/wd4267;/EHsc") diff --git a/sdk/compiler/cmake/windows/NvBlastExtPhysX.cmake b/sdk/compiler/cmake/windows/NvBlastExtPhysX.cmake old mode 100644 new mode 100755 index 9bf7614..aea6c23 --- a/sdk/compiler/cmake/windows/NvBlastExtPhysX.cmake +++ b/sdk/compiler/cmake/windows/NvBlastExtPhysX.cmake @@ -1,24 +1,24 @@ -# -# Build NvBlastExt Windows -# - -SET(BLASTEXT_PLATFORM_COMMON_FILES - ${COMMON_SOURCE_DIR}/NvBlastIncludeWindows.h -) - -SET(BLASTEXT_PLATFORM_INCLUDES -) - -SET(BLASTEXT_COMPILE_DEFS - # Common to all configurations - ${BLAST_SLN_COMPILE_DEFS};_CONSOLE; - - $<$:${BLAST_SLN_DEBUG_COMPILE_DEFS}> - $<$:${BLAST_SLN_CHECKED_COMPILE_DEFS}> - $<$:${BLAST_SLN_PROFILE_COMPILE_DEFS}> - $<$:${BLAST_SLN_RELEASE_COMPILE_DEFS}> -) - -SET(BLASTEXT_PHYSX_LIBTYPE SHARED) - -SET(BLASTEXT_PLATFORM_COMPILE_OPTIONS "/wd4100;/wd4239;/wd4244;/wd4245;/wd4267;/EHsc") +# +# Build NvBlastExt Windows +# + +SET(BLASTEXT_PLATFORM_COMMON_FILES + ${COMMON_SOURCE_DIR}/NvBlastIncludeWindows.h +) + +SET(BLASTEXT_PLATFORM_INCLUDES +) + +SET(BLASTEXT_COMPILE_DEFS + # Common to all configurations + ${BLAST_SLN_COMPILE_DEFS};_CONSOLE; + + $<$:${BLAST_SLN_DEBUG_COMPILE_DEFS}> + $<$:${BLAST_SLN_CHECKED_COMPILE_DEFS}> + $<$:${BLAST_SLN_PROFILE_COMPILE_DEFS}> + $<$:${BLAST_SLN_RELEASE_COMPILE_DEFS}> +) + +SET(BLASTEXT_PHYSX_LIBTYPE SHARED) + +SET(BLASTEXT_PLATFORM_COMPILE_OPTIONS "/wd4100;/wd4239;/wd4244;/wd4245;/wd4267;/EHsc") diff --git a/sdk/compiler/cmake/windows/NvBlastExtPxSerialization.cmake b/sdk/compiler/cmake/windows/NvBlastExtPxSerialization.cmake old mode 100644 new mode 100755 index 4ea6ea9..66b5211 --- a/sdk/compiler/cmake/windows/NvBlastExtPxSerialization.cmake +++ b/sdk/compiler/cmake/windows/NvBlastExtPxSerialization.cmake @@ -1,26 +1,26 @@ -# -# Build NvBlastPxExtSerialization Windows -# - -SET(BLASTEXTPXSERIALIZATION_PLATFORM_COMMON_FILES - ${COMMON_SOURCE_DIR}/NvBlastIncludeWindows.h -) - -SET(BLASTEXTPXSERIALIZATION_PLATFORM_INCLUDES -) - -SET(BLASTEXTPXSERIALIZATION_COMPILE_DEFS - # Common to all configurations - ${BLAST_SLN_COMPILE_DEFS};_CONSOLE; - - $<$:${BLAST_SLN_DEBUG_COMPILE_DEFS}> - $<$:${BLAST_SLN_CHECKED_COMPILE_DEFS}> - $<$:${BLAST_SLN_PROFILE_COMPILE_DEFS}> - $<$:${BLAST_SLN_RELEASE_COMPILE_DEFS}> -) - -SET(BLASTEXTPXSERIALIZATION_LIB_TYPE SHARED) - - -SET(BLASTEXTPXSERIALIZATION_COMPILE_OPTIONS "/wd4100;/wd4239;/wd4244;/wd4245;/wd4267;/wd4702;/wd4800;/wd4541;/wd4189;/wd4714;/wd4018;/wd4456;/wd4091;/wd4127;/EHsc") - +# +# Build NvBlastPxExtSerialization Windows +# + +SET(BLASTEXTPXSERIALIZATION_PLATFORM_COMMON_FILES + ${COMMON_SOURCE_DIR}/NvBlastIncludeWindows.h +) + +SET(BLASTEXTPXSERIALIZATION_PLATFORM_INCLUDES +) + +SET(BLASTEXTPXSERIALIZATION_COMPILE_DEFS + # Common to all configurations + ${BLAST_SLN_COMPILE_DEFS};_CONSOLE; + + $<$:${BLAST_SLN_DEBUG_COMPILE_DEFS}> + $<$:${BLAST_SLN_CHECKED_COMPILE_DEFS}> + $<$:${BLAST_SLN_PROFILE_COMPILE_DEFS}> + $<$:${BLAST_SLN_RELEASE_COMPILE_DEFS}> +) + +SET(BLASTEXTPXSERIALIZATION_LIB_TYPE SHARED) + + +SET(BLASTEXTPXSERIALIZATION_COMPILE_OPTIONS "/wd4100;/wd4239;/wd4244;/wd4245;/wd4267;/wd4702;/wd4800;/wd4541;/wd4189;/wd4714;/wd4018;/wd4456;/wd4091;/wd4127;/EHsc") + diff --git a/sdk/compiler/cmake/windows/NvBlastExtSerialization.cmake b/sdk/compiler/cmake/windows/NvBlastExtSerialization.cmake old mode 100644 new mode 100755 index 8b26799..7c5355e --- a/sdk/compiler/cmake/windows/NvBlastExtSerialization.cmake +++ b/sdk/compiler/cmake/windows/NvBlastExtSerialization.cmake @@ -1,26 +1,26 @@ -# -# Build NvBlastExtSerialization Windows -# - -SET(BLASTEXTSERIALIZATION_PLATFORM_COMMON_FILES - ${COMMON_SOURCE_DIR}/NvBlastIncludeWindows.h -) - -SET(BLASTEXTSERIALIZATION_PLATFORM_INCLUDES -) - -SET(BLASTEXTSERIALIZATION_COMPILE_DEFS - # Common to all configurations - ${BLAST_SLN_COMPILE_DEFS};_CONSOLE; - - $<$:${BLAST_SLN_DEBUG_COMPILE_DEFS}> - $<$:${BLAST_SLN_CHECKED_COMPILE_DEFS}> - $<$:${BLAST_SLN_PROFILE_COMPILE_DEFS}> - $<$:${BLAST_SLN_RELEASE_COMPILE_DEFS}> -) - -SET(BLASTEXTSERIALIZATION_LIB_TYPE SHARED) - - -SET(BLASTEXTSERIALIZATION_COMPILE_OPTIONS "/wd4100;/wd4239;/wd4244;/wd4245;/wd4267;/wd4702;/wd4800;/wd4541;/wd4189;/wd4714;/wd4018;/wd4456;/wd4091;/wd4127;/EHsc") - +# +# Build NvBlastExtSerialization Windows +# + +SET(BLASTEXTSERIALIZATION_PLATFORM_COMMON_FILES + ${COMMON_SOURCE_DIR}/NvBlastIncludeWindows.h +) + +SET(BLASTEXTSERIALIZATION_PLATFORM_INCLUDES +) + +SET(BLASTEXTSERIALIZATION_COMPILE_DEFS + # Common to all configurations + ${BLAST_SLN_COMPILE_DEFS};_CONSOLE; + + $<$:${BLAST_SLN_DEBUG_COMPILE_DEFS}> + $<$:${BLAST_SLN_CHECKED_COMPILE_DEFS}> + $<$:${BLAST_SLN_PROFILE_COMPILE_DEFS}> + $<$:${BLAST_SLN_RELEASE_COMPILE_DEFS}> +) + +SET(BLASTEXTSERIALIZATION_LIB_TYPE SHARED) + + +SET(BLASTEXTSERIALIZATION_COMPILE_OPTIONS "/wd4100;/wd4239;/wd4244;/wd4245;/wd4267;/wd4702;/wd4800;/wd4541;/wd4189;/wd4714;/wd4018;/wd4456;/wd4091;/wd4127;/EHsc") + diff --git a/sdk/compiler/cmake/windows/NvBlastExtShaders.cmake b/sdk/compiler/cmake/windows/NvBlastExtShaders.cmake old mode 100644 new mode 100755 index 7406d74..6fb4410 --- a/sdk/compiler/cmake/windows/NvBlastExtShaders.cmake +++ b/sdk/compiler/cmake/windows/NvBlastExtShaders.cmake @@ -1,24 +1,24 @@ -# -# Build NvBlastExt Windows -# - -SET(BLASTEXT_PLATFORM_COMMON_FILES - ${COMMON_SOURCE_DIR}/NvBlastIncludeWindows.h -) - -SET(BLASTEXT_PLATFORM_INCLUDES -) - -SET(BLASTEXT_COMPILE_DEFS - # Common to all configurations - ${BLAST_SLN_COMPILE_DEFS};_CONSOLE; - - $<$:${BLAST_SLN_DEBUG_COMPILE_DEFS}> - $<$:${BLAST_SLN_CHECKED_COMPILE_DEFS}> - $<$:${BLAST_SLN_PROFILE_COMPILE_DEFS}> - $<$:${BLAST_SLN_RELEASE_COMPILE_DEFS}> -) - -SET(BLAST_EXT_SHARED_LIB_TYPE SHARED) - -SET(BLASTEXT_PLATFORM_COMPILE_OPTIONS "/wd4100;/wd4239;/wd4244;/wd4245;/wd4267;/EHsc") +# +# Build NvBlastExt Windows +# + +SET(BLASTEXT_PLATFORM_COMMON_FILES + ${COMMON_SOURCE_DIR}/NvBlastIncludeWindows.h +) + +SET(BLASTEXT_PLATFORM_INCLUDES +) + +SET(BLASTEXT_COMPILE_DEFS + # Common to all configurations + ${BLAST_SLN_COMPILE_DEFS};_CONSOLE; + + $<$:${BLAST_SLN_DEBUG_COMPILE_DEFS}> + $<$:${BLAST_SLN_CHECKED_COMPILE_DEFS}> + $<$:${BLAST_SLN_PROFILE_COMPILE_DEFS}> + $<$:${BLAST_SLN_RELEASE_COMPILE_DEFS}> +) + +SET(BLAST_EXT_SHARED_LIB_TYPE SHARED) + +SET(BLASTEXT_PLATFORM_COMPILE_OPTIONS "/wd4100;/wd4239;/wd4244;/wd4245;/wd4267;/EHsc") diff --git a/sdk/compiler/cmake/windows/NvBlastExtTkSerialization.cmake b/sdk/compiler/cmake/windows/NvBlastExtTkSerialization.cmake old mode 100644 new mode 100755 index bdd2ebe..b51eb8a --- a/sdk/compiler/cmake/windows/NvBlastExtTkSerialization.cmake +++ b/sdk/compiler/cmake/windows/NvBlastExtTkSerialization.cmake @@ -1,26 +1,26 @@ -# -# Build NvBlastTkExtSerialization Windows -# - -SET(BLASTEXTTKSERIALIZATION_PLATFORM_COMMON_FILES - ${COMMON_SOURCE_DIR}/NvBlastIncludeWindows.h -) - -SET(BLASTEXTTKSERIALIZATION_PLATFORM_INCLUDES -) - -SET(BLASTEXTTKSERIALIZATION_COMPILE_DEFS - # Common to all configurations - ${BLAST_SLN_COMPILE_DEFS};_CONSOLE; - - $<$:${BLAST_SLN_DEBUG_COMPILE_DEFS}> - $<$:${BLAST_SLN_CHECKED_COMPILE_DEFS}> - $<$:${BLAST_SLN_PROFILE_COMPILE_DEFS}> - $<$:${BLAST_SLN_RELEASE_COMPILE_DEFS}> -) - -SET(BLASTEXTTKSERIALIZATION_LIB_TYPE SHARED) - - -SET(BLASTEXTTKSERIALIZATION_COMPILE_OPTIONS "/wd4100;/wd4239;/wd4244;/wd4245;/wd4267;/wd4702;/wd4800;/wd4541;/wd4189;/wd4714;/wd4018;/wd4456;/wd4091;/wd4127;/EHsc") - +# +# Build NvBlastTkExtSerialization Windows +# + +SET(BLASTEXTTKSERIALIZATION_PLATFORM_COMMON_FILES + ${COMMON_SOURCE_DIR}/NvBlastIncludeWindows.h +) + +SET(BLASTEXTTKSERIALIZATION_PLATFORM_INCLUDES +) + +SET(BLASTEXTTKSERIALIZATION_COMPILE_DEFS + # Common to all configurations + ${BLAST_SLN_COMPILE_DEFS};_CONSOLE; + + $<$:${BLAST_SLN_DEBUG_COMPILE_DEFS}> + $<$:${BLAST_SLN_CHECKED_COMPILE_DEFS}> + $<$:${BLAST_SLN_PROFILE_COMPILE_DEFS}> + $<$:${BLAST_SLN_RELEASE_COMPILE_DEFS}> +) + +SET(BLASTEXTTKSERIALIZATION_LIB_TYPE SHARED) + + +SET(BLASTEXTTKSERIALIZATION_COMPILE_OPTIONS "/wd4100;/wd4239;/wd4244;/wd4245;/wd4267;/wd4702;/wd4800;/wd4541;/wd4189;/wd4714;/wd4018;/wd4456;/wd4091;/wd4127;/EHsc") + diff --git a/sdk/compiler/cmake/windows/NvBlastGlobals.cmake b/sdk/compiler/cmake/windows/NvBlastGlobals.cmake old mode 100644 new mode 100755 index 106c9aa..7a7324b --- a/sdk/compiler/cmake/windows/NvBlastGlobals.cmake +++ b/sdk/compiler/cmake/windows/NvBlastGlobals.cmake @@ -1,13 +1,13 @@ -# -# Build NvBlastGlobals Windows -# - -SET(BLASTGLOBALS_COMPILE_DEFS - # Common to all configurations - ${BLAST_SLN_COMPILE_DEFS};_CONSOLE - - $<$:${BLAST_SLN_DEBUG_COMPILE_DEFS}> - $<$:${BLAST_SLN_CHECKED_COMPILE_DEFS}> - $<$:${BLAST_SLN_PROFILE_COMPILE_DEFS}> - $<$:${BLAST_SLN_RELEASE_COMPILE_DEFS}> -) +# +# Build NvBlastGlobals Windows +# + +SET(BLASTGLOBALS_COMPILE_DEFS + # Common to all configurations + ${BLAST_SLN_COMPILE_DEFS};_CONSOLE + + $<$:${BLAST_SLN_DEBUG_COMPILE_DEFS}> + $<$:${BLAST_SLN_CHECKED_COMPILE_DEFS}> + $<$:${BLAST_SLN_PROFILE_COMPILE_DEFS}> + $<$:${BLAST_SLN_RELEASE_COMPILE_DEFS}> +) diff --git a/sdk/compiler/cmake/windows/NvBlastTk.cmake b/sdk/compiler/cmake/windows/NvBlastTk.cmake old mode 100644 new mode 100755 index 03854b9..409eff7 --- a/sdk/compiler/cmake/windows/NvBlastTk.cmake +++ b/sdk/compiler/cmake/windows/NvBlastTk.cmake @@ -1,24 +1,24 @@ -# -# Build NvBlastTk Windows -# - -SET(BLASTTK_PLATFORM_COMMON_FILES - ${COMMON_SOURCE_DIR}/NvBlastIncludeWindows.h -) - -SET(BLASTTK_PLATFORM_INCLUDES -) - -SET(BLASTTK_COMPILE_DEFS - # Common to all configurations - ${BLAST_SLN_COMPILE_DEFS};_CONSOLE - - $<$:${BLAST_SLN_DEBUG_COMPILE_DEFS}> - $<$:${BLAST_SLN_CHECKED_COMPILE_DEFS}> - $<$:${BLAST_SLN_PROFILE_COMPILE_DEFS}> - $<$:${BLAST_SLN_RELEASE_COMPILE_DEFS}> -) - -SET(BLASTTK_LIBTYPE "SHARED") - -SET(BLASTTK_PLATFORM_LINKED_LIBS Rpcrt4) +# +# Build NvBlastTk Windows +# + +SET(BLASTTK_PLATFORM_COMMON_FILES + ${COMMON_SOURCE_DIR}/NvBlastIncludeWindows.h +) + +SET(BLASTTK_PLATFORM_INCLUDES +) + +SET(BLASTTK_COMPILE_DEFS + # Common to all configurations + ${BLAST_SLN_COMPILE_DEFS};_CONSOLE + + $<$:${BLAST_SLN_DEBUG_COMPILE_DEFS}> + $<$:${BLAST_SLN_CHECKED_COMPILE_DEFS}> + $<$:${BLAST_SLN_PROFILE_COMPILE_DEFS}> + $<$:${BLAST_SLN_RELEASE_COMPILE_DEFS}> +) + +SET(BLASTTK_LIBTYPE "SHARED") + +SET(BLASTTK_PLATFORM_LINKED_LIBS Rpcrt4) -- cgit v1.2.3