aboutsummaryrefslogtreecommitdiff
path: root/PxShared/src/compiler
diff options
context:
space:
mode:
Diffstat (limited to 'PxShared/src/compiler')
-rw-r--r--PxShared/src/compiler/cmake/Android/CMakeLists.txt25
-rw-r--r--PxShared/src/compiler/cmake/IOS/CMakeLists.txt7
-rw-r--r--PxShared/src/compiler/cmake/Linux/CMakeLists.txt19
-rw-r--r--PxShared/src/compiler/cmake/Mac/CMakeLists.txt7
-rw-r--r--PxShared/src/compiler/cmake/Modules/FindnvToolsExt.cmake2
-rw-r--r--PxShared/src/compiler/cmake/common/CMakeLists.txt2
-rw-r--r--PxShared/src/compiler/cmake/html5/CMakeLists.txt3
-rw-r--r--PxShared/src/compiler/cmake/windows/CMakeLists.txt17
8 files changed, 46 insertions, 36 deletions
diff --git a/PxShared/src/compiler/cmake/Android/CMakeLists.txt b/PxShared/src/compiler/cmake/Android/CMakeLists.txt
index 0499c29..9aa00f9 100644
--- a/PxShared/src/compiler/cmake/Android/CMakeLists.txt
+++ b/PxShared/src/compiler/cmake/Android/CMakeLists.txt
@@ -1,34 +1,37 @@
cmake_minimum_required(VERSION 3.3)
+PROJECT(PxShared )
include(../common/CMakeLists.txt)
STRING(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWERCASE)
-IF(NOT DEFINED TARGET_BUILD_PLATFORM) # Not defined, default to Android
- SET(TARGET_BUILD_PLATFORM "Android")
+IF(NOT DEFINED TARGET_BUILD_PLATFORM) # Not defined, default to android
+ SET(TARGET_BUILD_PLATFORM "android")
ENDIF()
-SET(PLATFORM_LIST Android)
+SET(PLATFORM_LIST android)
IF (NOT ${TARGET_BUILD_PLATFORM} IN_LIST PLATFORM_LIST)
MESSAGE(FATAL_ERROR "Invalid platform:" ${TARGET_BUILD_PLATFORM})
ENDIF()
if(${ANDROID_ABI} STREQUAL "armeabi-v7a")
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-rtti -fno-exceptions -ffast-math -ffunction-sections -fdata-sections -D__STDC_LIMIT_MACROS -Wno-invalid-offsetof ")
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-rtti -fno-exceptions -ffunction-sections -fdata-sections -funwind-tables -fomit-frame-pointer -funswitch-loops -finline-limit=300 -fno-strict-aliasing -fstack-protector -Wno-invalid-offsetof ")
+elseif(${ANDROID_ABI} STREQUAL "armeabi-v7a with NEON")
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-rtti -ffast-math -fno-exceptions -ffunction-sections -funwind-tables -fomit-frame-pointer -funswitch-loops -finline-limit=300 -fno-strict-aliasing -fstack-protector -Wno-invalid-offsetof ")
elseif(${ANDROID_ABI} STREQUAL "arm64-v8a")
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-rtti -fno-exceptions -ffast-math -ffunction-sections -fdata-sections -D__STDC_LIMIT_MACROS -Wno-invalid-offsetof ")
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-rtti -fno-exceptions -ffunction-sections -fdata-sections -Wno-invalid-offsetof ")
elseif(${ANDROID_ABI} STREQUAL "x86")
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-rtti -fno-exceptions -ffast-math -ffunction-sections -fdata-sections -D__STDC_LIMIT_MACROS -Wno-invalid-offsetof -fpack-struct=8 -malign-double ")
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-rtti -fno-exceptions -ffunction-sections -fdata-sections -Wno-invalid-offsetof -fpack-struct=8 -malign-double ")
elseif(${ANDROID_ABI} STREQUAL "x86_64")
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-rtti -fno-exceptions -ffast-math -ffunction-sections -fdata-sections -D__STDC_LIMIT_MACROS -Wno-invalid-offsetof -mstackrealign -msse3 ")
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-rtti -fno-exceptions -ffunction-sections -fdata-sections -Wno-invalid-offsetof -mstackrealign -msse3 ")
endif()
SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g")
-SET(CMAKE_CXX_FLAGS_CHECKED "-O2")
-SET(CMAKE_CXX_FLAGS_PROFILE "-O2")
-SET(CMAKE_CXX_FLAGS_RELEASE "-O2")
+SET(CMAKE_CXX_FLAGS_CHECKED "-O3")
+SET(CMAKE_CXX_FLAGS_PROFILE "-O3")
+SET(CMAKE_CXX_FLAGS_RELEASE "-O3")
-SET(PXSHARED_ANDROID_COMPILE_DEFS _LIB;)
+SET(PXSHARED_ANDROID_COMPILE_DEFS _LIB;__STDC_LIMIT_MACROS;)
SET(PXSHARED_ANDROID_DEBUG_COMPILE_DEFS _DEBUG;PX_DEBUG=1;PX_CHECKED=1)
SET(PXSHARED_ANDROID_CHECKED_COMPILE_DEFS NDEBUG;PX_CHECKED=1)
SET(PXSHARED_ANDROID_PROFILE_COMPILE_DEFS NDEBUG;PX_PROFILE=1)
diff --git a/PxShared/src/compiler/cmake/IOS/CMakeLists.txt b/PxShared/src/compiler/cmake/IOS/CMakeLists.txt
index d281e32..4e2f814 100644
--- a/PxShared/src/compiler/cmake/IOS/CMakeLists.txt
+++ b/PxShared/src/compiler/cmake/IOS/CMakeLists.txt
@@ -1,12 +1,13 @@
cmake_minimum_required(VERSION 3.3)
+PROJECT(PxShared CXX)
include(../common/CMakeLists.txt)
-IF(NOT DEFINED TARGET_BUILD_PLATFORM) # Not defined, default to IOS
- SET(TARGET_BUILD_PLATFORM "IOS")
+IF(NOT DEFINED TARGET_BUILD_PLATFORM) # Not defined, default to ios
+ SET(TARGET_BUILD_PLATFORM "ios")
ENDIF()
-SET(PLATFORM_LIST IOS)
+SET(PLATFORM_LIST ios)
IF (NOT ${TARGET_BUILD_PLATFORM} IN_LIST PLATFORM_LIST)
MESSAGE(FATAL_ERROR "Invalid platform:" ${TARGET_BUILD_PLATFORM})
diff --git a/PxShared/src/compiler/cmake/Linux/CMakeLists.txt b/PxShared/src/compiler/cmake/Linux/CMakeLists.txt
index 2fa592e..ea25a8b 100644
--- a/PxShared/src/compiler/cmake/Linux/CMakeLists.txt
+++ b/PxShared/src/compiler/cmake/Linux/CMakeLists.txt
@@ -1,13 +1,14 @@
cmake_minimum_required(VERSION 3.3)
+PROJECT(PxShared CXX)
include(../common/CMakeLists.txt)
STRING(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWERCASE)
-IF(NOT DEFINED TARGET_BUILD_PLATFORM) # Not defined, default to Linux
- SET(TARGET_BUILD_PLATFORM "Linux")
+IF(NOT DEFINED TARGET_BUILD_PLATFORM) # Not defined, default to linux
+ SET(TARGET_BUILD_PLATFORM "linux")
ENDIF()
-SET(PLATFORM_LIST Linux)
+SET(PLATFORM_LIST linux)
IF (NOT ${TARGET_BUILD_PLATFORM} IN_LIST PLATFORM_LIST)
MESSAGE(FATAL_ERROR "Invalid platform:" ${TARGET_BUILD_PLATFORM})
@@ -16,16 +17,16 @@ ENDIF()
IF (${CMAKE_LIBRARY_ARCHITECTURE} STREQUAL "x86_64-unknown-linux-gnu" OR ${CMAKE_LIBRARY_ARCHITECTURE} STREQUAL "x86_64-linux-gnu")
IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
# using Clang
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-rtti -fno-exceptions -ffast-math -ffunction-sections -fdata-sections -Werror -ferror-limit=0 -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-cast-align -Wno-conversion -Wno-missing-noreturn -Wno-missing-variable-declarations -Wno-shift-sign-overflow -Wno-covered-switch-default -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-unused-member-function -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-deprecated -Wno-non-virtual-dtor -Wno-invalid-noreturn -Wno-return-type-c-linkage -Wno-reserved-id-macro -Wno-c++98-compat-pedantic -Wno-unused-local-typedef -Wno-old-style-cast -Wno-newline-eof -Wno-unused-private-field -Wno-undefined-func-template -Wno-format-nonliteral -Wno-implicit-fallthrough -Wno-undefined-reinterpret-cast")
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-rtti -fno-exceptions -ffast-math -ffunction-sections -fdata-sections -Werror -ferror-limit=0 -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-cast-align -Wno-conversion -Wno-missing-noreturn -Wno-missing-variable-declarations -Wno-shift-sign-overflow -Wno-covered-switch-default -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-unused-member-function -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-deprecated -Wno-non-virtual-dtor -Wno-invalid-noreturn -Wno-return-type-c-linkage -Wno-reserved-id-macro -Wno-c++98-compat-pedantic -Wno-unused-local-typedef -Wno-old-style-cast -Wno-newline-eof -Wno-unused-private-field -Wno-undefined-func-template -Wno-format-nonliteral -Wno-implicit-fallthrough -Wno-undefined-reinterpret-cast -Wno-disabled-macro-expansion")
ELSEIF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
# using GCC
SET(LIBPATH_SUFFIX "x64")
SET(CMAKE_CXX_FLAGS "-Werror -m64 -fPIC -msse2 -mfpmath=sse -ffast-math -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Wall -Wextra -fno-strict-aliasing -fdiagnostics-show-option -Wno-invalid-offsetof -Wno-uninitialized -Wno-missing-field-initializers")
ENDIF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
ELSEIF(${CMAKE_LIBRARY_ARCHITECTURE} STREQUAL "arm-unknown-linux-gnueabihf")
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -mfpu=neon -fno-rtti -fno-exceptions -ffast-math -ffunction-sections -fdata-sections -Werror -ferror-limit=0 -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-cast-align -Wno-conversion -Wno-missing-noreturn -Wno-missing-variable-declarations -Wno-shift-sign-overflow -Wno-covered-switch-default -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-unused-member-function -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-deprecated -Wno-non-virtual-dtor -Wno-old-style-cast -Wno-return-type-c-linkage -Wno-format-nonliteral -Wno-implicit-fallthrough")
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -mfpu=neon -fno-rtti -fno-exceptions -ffast-math -ffunction-sections -fdata-sections -Werror -ferror-limit=0 -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-cast-align -Wno-conversion -Wno-missing-noreturn -Wno-missing-variable-declarations -Wno-shift-sign-overflow -Wno-covered-switch-default -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-unused-member-function -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-deprecated -Wno-non-virtual-dtor -Wno-old-style-cast -Wno-return-type-c-linkage -Wno-format-nonliteral -Wno-implicit-fallthrough -Wno-disabled-macro-expansion")
ELSEIF(${CMAKE_LIBRARY_ARCHITECTURE} STREQUAL "aarch64-unknown-linux-gnueabi")
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-rtti -fno-exceptions -ffast-math -ffunction-sections -fdata-sections -Werror -ferror-limit=0 -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-cast-align -Wno-conversion -Wno-missing-noreturn -Wno-missing-variable-declarations -Wno-shift-sign-overflow -Wno-covered-switch-default -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-unused-member-function -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-deprecated -Wno-non-virtual-dtor -Wno-old-style-cast -Wno-return-type-c-linkage -Wno-format-nonliteral -Wno-unused-local-typedef -Wno-implicit-fallthrough")
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-rtti -fno-exceptions -ffast-math -ffunction-sections -fdata-sections -Werror -ferror-limit=0 -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-cast-align -Wno-conversion -Wno-missing-noreturn -Wno-missing-variable-declarations -Wno-shift-sign-overflow -Wno-covered-switch-default -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-unused-member-function -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-deprecated -Wno-non-virtual-dtor -Wno-old-style-cast -Wno-return-type-c-linkage -Wno-format-nonliteral -Wno-unused-local-typedef -Wno-implicit-fallthrough -Wno-disabled-macro-expansion")
ELSE(${CMAKE_LIBRARY_ARCHITECTURE} STREQUAL "x86_64-unknown-linux-gnu" OR ${CMAKE_LIBRARY_ARCHITECTURE} STREQUAL "x86_64-linux-gnu")
MESSAGE(FATAL_ERROR "Unknown CMAKE_LIBRARY_ARCHITECTURE ${CMAKE_LIBRARY_ARCHITECTURE}")
ENDIF(${CMAKE_LIBRARY_ARCHITECTURE} STREQUAL "x86_64-unknown-linux-gnu" OR ${CMAKE_LIBRARY_ARCHITECTURE} STREQUAL "x86_64-linux-gnu")
@@ -36,7 +37,7 @@ SET(CMAKE_CXX_FLAGS_CHECKED "-O3 -g -gdwarf-3")
SET(CMAKE_CXX_FLAGS_PROFILE "-O3 -g -gdwarf-3")
SET(CMAKE_CXX_FLAGS_RELEASE "-O3 -g -gdwarf-3")
-IF(DEFINED PX_GENERATE_GPU_PROJECTS)
+IF(DEFINED GENERATE_GPU_PROJECTS)
SET(PXSHARED_LINUX_COMPILE_DEFS _LIB)
ELSE()
# Disable cuda and dx for all projects on windows
@@ -71,7 +72,7 @@ IF(DEFINED PX_SELECT_COMPONENTS)
INCLUDE(PxTask.cmake)
endif()
if ("PxCudaContextManager" IN_LIST PX_SELECT_COMPONENTS)
- IF(DEFINED PX_GENERATE_GPU_PROJECTS)
+ IF(DEFINED GENERATE_GPU_PROJECTS)
INCLUDE(PxCudaContextManager.cmake)
ENDIF()
endif()
@@ -80,7 +81,7 @@ INCLUDE(PxFoundation.cmake)
INCLUDE(PsFastXml.cmake)
INCLUDE(PxPvdSDK.cmake)
INCLUDE(PxTask.cmake)
-IF(DEFINED PX_GENERATE_GPU_PROJECTS)
+IF(DEFINED GENERATE_GPU_PROJECTS)
INCLUDE(PxCudaContextManager.cmake)
ENDIF()
ENDIF()
diff --git a/PxShared/src/compiler/cmake/Mac/CMakeLists.txt b/PxShared/src/compiler/cmake/Mac/CMakeLists.txt
index beb06bc..3242b46 100644
--- a/PxShared/src/compiler/cmake/Mac/CMakeLists.txt
+++ b/PxShared/src/compiler/cmake/Mac/CMakeLists.txt
@@ -1,12 +1,13 @@
cmake_minimum_required(VERSION 3.3)
+PROJECT(PxShared CXX)
include(../common/CMakeLists.txt)
-IF(NOT DEFINED TARGET_BUILD_PLATFORM) # Not defined, default to Mac
- SET(TARGET_BUILD_PLATFORM "Mac")
+IF(NOT DEFINED TARGET_BUILD_PLATFORM) # Not defined, default to mac
+ SET(TARGET_BUILD_PLATFORM "mac")
ENDIF()
-SET(PLATFORM_LIST Mac)
+SET(PLATFORM_LIST mac)
IF (NOT ${TARGET_BUILD_PLATFORM} IN_LIST PLATFORM_LIST)
MESSAGE(FATAL_ERROR "Invalid platform:" ${TARGET_BUILD_PLATFORM})
diff --git a/PxShared/src/compiler/cmake/Modules/FindnvToolsExt.cmake b/PxShared/src/compiler/cmake/Modules/FindnvToolsExt.cmake
index c1675ae..f7bc761 100644
--- a/PxShared/src/compiler/cmake/Modules/FindnvToolsExt.cmake
+++ b/PxShared/src/compiler/cmake/Modules/FindnvToolsExt.cmake
@@ -13,7 +13,7 @@ FIND_PATH( NVTOOLSEXT_INCLUDE_DIRS nvToolsExt.h
INCLUDE(FindPackageHandleStandardArgs)
-IF(TARGET_BUILD_PLATFORM STREQUAL "Windows")
+IF(TARGET_BUILD_PLATFORM STREQUAL "windows")
# NOTE: Doesn't make sense for all platforms - ARM
IF(CMAKE_CL_64)
SET(NVTOOLSEXT_LIBNAME "nvToolsExt64_1")
diff --git a/PxShared/src/compiler/cmake/common/CMakeLists.txt b/PxShared/src/compiler/cmake/common/CMakeLists.txt
index 22d2097..3bbb57a 100644
--- a/PxShared/src/compiler/cmake/common/CMakeLists.txt
+++ b/PxShared/src/compiler/cmake/common/CMakeLists.txt
@@ -1,7 +1,5 @@
cmake_minimum_required(VERSION 3.3)
-PROJECT(PxShared CXX)
-
CMAKE_POLICY(SET CMP0057 NEW) # Enable IN_LIST
IF(DEFINED ENV{GW_DEPS_ROOT})
diff --git a/PxShared/src/compiler/cmake/html5/CMakeLists.txt b/PxShared/src/compiler/cmake/html5/CMakeLists.txt
index 8b9587a..e0d2776 100644
--- a/PxShared/src/compiler/cmake/html5/CMakeLists.txt
+++ b/PxShared/src/compiler/cmake/html5/CMakeLists.txt
@@ -1,10 +1,11 @@
cmake_minimum_required(VERSION 3.3)
+PROJECT(PxShared CXX)
#set(CMAKE_VERBOSE_MAKEFILE ON)
include(../common/CMakeLists.txt)
IF(NOT DEFINED TARGET_BUILD_PLATFORM) # Not defined, default to HTML5
- SET(TARGET_BUILD_PLATFORM "HTML5")
+ SET(TARGET_BUILD_PLATFORM "html5")
ENDIF()
SET(PLATFORM_LIST HTML5)
diff --git a/PxShared/src/compiler/cmake/windows/CMakeLists.txt b/PxShared/src/compiler/cmake/windows/CMakeLists.txt
index 39b7dfc..fe2b00d 100644
--- a/PxShared/src/compiler/cmake/windows/CMakeLists.txt
+++ b/PxShared/src/compiler/cmake/windows/CMakeLists.txt
@@ -1,12 +1,13 @@
cmake_minimum_required(VERSION 3.3)
+PROJECT(PxShared CXX)
include(../common/CMakeLists.txt)
-IF(NOT DEFINED TARGET_BUILD_PLATFORM) # Not defined, default to Windows
- SET(TARGET_BUILD_PLATFORM "Windows")
+IF(NOT DEFINED TARGET_BUILD_PLATFORM) # Not defined, default to windows
+ SET(TARGET_BUILD_PLATFORM "windows")
ENDIF()
-SET(PLATFORM_LIST Windows)
+SET(PLATFORM_LIST windows)
IF (NOT ${TARGET_BUILD_PLATFORM} IN_LIST PLATFORM_LIST)
MESSAGE(FATAL_ERROR "Invalid platform:" ${TARGET_BUILD_PLATFORM})
@@ -33,7 +34,7 @@ SET(CMAKE_SHARED_LINKER_FLAGS "/DEBUG")
# Controls PX_NVTX for all projects on windows
SET(PXSHARED_WINDOWS_ENABLE_NVTX 0)
-IF(DEFINED PX_GENERATE_GPU_PROJECTS)
+IF(DEFINED LINK_GPU_BINARIES)
SET(PXSHARED_WINDOWS_COMPILE_DEFS WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;)
ELSE()
# Disable cuda and dx for all projects on windows
@@ -44,6 +45,10 @@ SET(PXSHARED_WINDOWS_CHECKED_COMPILE_DEFS NDEBUG;PX_CHECKED=1;PX_NVTX=${PXSHARED
SET(PXSHARED_WINDOWS_PROFILE_COMPILE_DEFS NDEBUG;PX_PROFILE=1;PX_NVTX=${PXSHARED_WINDOWS_ENABLE_NVTX})
SET(PXSHARED_WINDOWS_RELEASE_COMPILE_DEFS NDEBUG)
+IF(DEFINED PX_SCALAR_MATH)
+ ADD_DEFINITIONS(-DPX_SIMD_DISABLED)
+ENDIF()
+
IF(CMAKE_CL_64)
ADD_DEFINITIONS(-DWIN64)
ENDIF(CMAKE_CL_64)
@@ -74,7 +79,7 @@ IF(DEFINED PX_SELECT_COMPONENTS)
INCLUDE(PxTask.cmake)
endif()
if ("PxCudaContextManager" IN_LIST PX_SELECT_COMPONENTS)
- IF(DEFINED PX_GENERATE_GPU_PROJECTS)
+ IF(DEFINED GENERATE_GPU_PROJECTS)
INCLUDE(PxCudaContextManager.cmake)
ENDIF()
endif()
@@ -83,7 +88,7 @@ INCLUDE(PxFoundation.cmake)
INCLUDE(PsFastXml.cmake)
INCLUDE(PxPvdSDK.cmake)
INCLUDE(PxTask.cmake)
-IF(DEFINED PX_GENERATE_GPU_PROJECTS)
+IF(DEFINED GENERATE_GPU_PROJECTS)
INCLUDE(PxCudaContextManager.cmake)
ENDIF()
ENDIF()