1.1.6 Release.1.1.6

2 files changed, 0 insertions, 161 deletions

diff --git a/PxShared/src/compiler/cmake/uwp/CMakeLists.txt b/PxShared/src/compiler/cmake/uwp/CMakeLists.txt
deleted file mode 100644
index dd3250e..0000000
--- a/PxShared/src/compiler/cmake/uwp/CMakeLists.txt
+++ /dev/null
@@ -1,64 +0,0 @@
-
-SET(CMAKE_CXX_FLAGS "/Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4577 /wd4530 /d2Zi+ /WX /W4 /ZW /GF /GS- /GR- /Gd /fp:fast ${DISABLE_ITERATOR_DEBUGGING}")
-
-SET(CMAKE_CXX_FLAGS_DEBUG   "/Od ${WINCRT_NDEBUG} /Zi")
-SET(CMAKE_CXX_FLAGS_CHECKED "/Ox ${WINCRT_NDEBUG} /Zi")
-SET(CMAKE_CXX_FLAGS_PROFILE "/Ox ${WINCRT_NDEBUG} /Zi")
-SET(CMAKE_CXX_FLAGS_RELEASE "/Ox ${WINCRT_NDEBUG} /Zi")
-
-# Build PDBs for all configurations
-SET(CMAKE_SHARED_LINKER_FLAGS "/DEBUG")
-
-# Controls PX_NVTX for all projects on windows
-SET(PXSHARED_UWP_ENABLE_NVTX 0)	
-
-# Disable cuda and dx for all projects on windows
-SET(PXSHARED_UWP_COMPILE_DEFS WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;DISABLE_CUDA_PHYSX;)
-
-SET(PXSHARED_UWP_DEBUG_COMPILE_DEFS   PX_DEBUG=1;PX_CHECKED=1;PX_NVTX=${PXSHARED_UWP_ENABLE_NVTX})
-SET(PXSHARED_UWP_CHECKED_COMPILE_DEFS PX_CHECKED=1;PX_NVTX=${PXSHARED_UWP_ENABLE_NVTX})
-SET(PXSHARED_UWP_PROFILE_COMPILE_DEFS PX_PROFILE=1;PX_NVTX=${PXSHARED_UWP_ENABLE_NVTX})
-SET(PXSHARED_UWP_RELEASE_COMPILE_DEFS )
-
-IF(PX_SCALAR_MATH)
-	ADD_DEFINITIONS(-DPX_SIMD_DISABLED)
-ENDIF()
-
-IF(CMAKE_CL_64)
-	ADD_DEFINITIONS(-DWIN64)
-ENDIF(CMAKE_CL_64)		
-
-
-# Include project cmake files here
-IF(DEFINED PX_SELECT_COMPONENTS)
-	if ("PxFoundation" IN_LIST PX_SELECT_COMPONENTS)
-		INCLUDE(PxFoundation.cmake)
-	endif()
-ELSE()
-	INCLUDE(PxFoundation.cmake)
-
-	INCLUDE(CMakePackageConfigHelpers)
-
-	configure_file(templates/ProjectVersion.cmake.in ${PXSHARED_ROOT_DIR}/pxshared-config-version.cmake @ONLY)
-
-#	WRITE_BASIC_PACKAGE_VERSION_FILE(${PXSHARED_ROOT_DIR}/pxshared-config-version.cmake VERSION ${PXSHARED_VERSION} COMPATIBILITY ExactVersion)
-
-	SET(PXSHARED_LIBS PxFoundation)
-		
-	# PX_ROOT_LIB_DIR is set by NvidiaBuildOptions and put into the cache. It's a relative path to the lib dir without config
-
-	install(
-		TARGETS ${PXSHARED_LIBS}
-		EXPORT PxShared
-		DESTINATION $<$<CONFIG:debug>:${PX_ROOT_LIB_DIR}/debug>$<$<CONFIG:release>:${PX_ROOT_LIB_DIR}/release>$<$<CONFIG:checked>:${PX_ROOT_LIB_DIR}/checked>$<$<CONFIG:profile>:${PX_ROOT_LIB_DIR}/profile>	)
-
-	install(EXPORT PxShared FILE pxshared-config.cmake DESTINATION cmake)
-	
-	install(FILES ${PXSHARED_ROOT_DIR}/pxshared-config-version.cmake DESTINATION ${CMAKE_INSTALL_PREFIX}/cmake)
-	
-	# This doesn't use libpath-suffix, as it won't have the "wrapper" top
-	export(EXPORT PxShared FILE ${PXSHARED_ROOT_DIR}/pxshared-config.cmake)
-	
-	
-ENDIF()
-
diff --git a/PxShared/src/compiler/cmake/uwp/PxFoundation.cmake b/PxShared/src/compiler/cmake/uwp/PxFoundation.cmake
deleted file mode 100644
index a4b666d..0000000
--- a/PxShared/src/compiler/cmake/uwp/PxFoundation.cmake
+++ /dev/null
@@ -1,97 +0,0 @@
-#
-# Build PxFoundation
-#
-
-# Can no longer just use LIBPATH_SUFFIX since it depends on build type
-IF(CMAKE_CL_64)
-	SET(RESOURCE_LIBPATH_SUFFIX "x64")
-ELSEIF(${PX_OUTPUT_ARCH} STREQUAL "arm")
-	SET(RESOURCE_LIBPATH_SUFFIX "arm")
-ELSE(CMAKE_CL_64)
-	SET(RESOURCE_LIBPATH_SUFFIX "x86")
-ENDIF(CMAKE_CL_64)
-
-SET(PXFOUNDATION_LIBTYPE SHARED)
-
-SET(PXFOUNDATION_RESOURCE_FILE
-	${PXSHARED_SOURCE_DIR}/compiler/resource_${RESOURCE_LIBPATH_SUFFIX}/PxFoundation.rc
-)
-SOURCE_GROUP(resource FILES ${PXFOUNDATION_RESOURCE_FILE})
-
-SET(PXFOUNDATION_PLATFORM_HEADERS
-	${PXSHARED_ROOT_DIR}/include/foundation/windows/PxWindowsIntrinsics.h	
-)
-SOURCE_GROUP("include\\windows" FILES ${PXFOUNDATION_PLATFORM_HEADERS})
-
-SET(PXFOUNDATION_PLATFORM_SOURCE
-	${LL_SOURCE_DIR}/src/windows/PsWindowsAtomic.cpp
-	${LL_SOURCE_DIR}/src/windows/PsWindowsCpu.cpp
-	${LL_SOURCE_DIR}/src/windows/PsWindowsFPU.cpp
-	${LL_SOURCE_DIR}/src/windows/PsWindowsMutex.cpp
-	${LL_SOURCE_DIR}/src/windows/PsWindowsPrintString.cpp
-	${LL_SOURCE_DIR}/src/windows/PsWindowsSList.cpp
-	${LL_SOURCE_DIR}/src/windows/PsWindowsSocket.cpp
-	${LL_SOURCE_DIR}/src/windows/PsWindowsSync.cpp
-	${LL_SOURCE_DIR}/src/windows/PsWindowsTime.cpp
-)
-SOURCE_GROUP("src\\src\\windows" FILES ${PXFOUNDATION_PLATFORM_SOURCE})
-
-SET(PXFOUNDATION_UWP_PLATFORM_SOURCE
-	${LL_SOURCE_DIR}/src/windows/PsUWPThread.cpp
-)
-SOURCE_GROUP("src\\src\\uwp" FILES ${PXFOUNDATION_UWP_PLATFORM_SOURCE})
-
-
-SET(PXFOUNDATION_PLATFORM_SOURCE_HEADERS
-	${LL_SOURCE_DIR}/include/windows/PsWindowsAoS.h
-	${LL_SOURCE_DIR}/include/windows/PsWindowsFPU.h
-	${LL_SOURCE_DIR}/include/windows/PsWindowsInclude.h
-	${LL_SOURCE_DIR}/include/windows/PsWindowsInlineAoS.h
-	${LL_SOURCE_DIR}/include/windows/PsWindowsIntrinsics.h
-	${LL_SOURCE_DIR}/include/windows/PsWindowsLoadLibrary.h
-	${LL_SOURCE_DIR}/include/windows/PsWindowsTrigConstants.h
-)
-SOURCE_GROUP("src\\include\\windows" FILES ${PXFOUNDATION_PLATFORM_SOURCE_HEADERS})
-
-SET(PXFOUNDATION_PLATFORM_SOURCE_HEADERS_2	
-	${LL_SOURCE_DIR}/include/unix/PsUnixInlineAoS.h	
-	${LL_SOURCE_DIR}/include/unix/PsUnixTrigConstants.h
-)
-SOURCE_GROUP("src\\include\\unix" FILES ${PXFOUNDATION_PLATFORM_SOURCE_HEADERS_2})
-
-SET(PXFOUNDATION_PLATFORM_SOURCE_HEADERS_3
-	${LL_SOURCE_DIR}/include/unix/neon/PsUnixNeonAoS.h
-	${LL_SOURCE_DIR}/include/unix/neon/PsUnixNeonInlineAoS.h
-)
-SOURCE_GROUP("src\\include\\unix\\neon" FILES ${PXFOUNDATION_PLATFORM_SOURCE_HEADERS_3})
-
-INSTALL(FILES ${PXFOUNDATION_PLATFORM_HEADERS} DESTINATION include/foundation/windows)
-
-INSTALL(FILES ${PXFOUNDATION_PLATFORM_SOURCE_HEADERS} DESTINATION src/foundation/include/windows)
-INSTALL(FILES ${PXFOUNDATION_PLATFORM_SOURCE_HEADERS_2} DESTINATION src/foundation/include/unix)
-INSTALL(FILES ${PXFOUNDATION_PLATFORM_SOURCE_HEADERS_3} DESTINATION src/foundation/include/unix/neon)
-
-SET(PXFOUNDATION_PLATFORM_FILES
-	${PXFOUNDATION_PLATFORM_HEADERS}
-	${PXFOUNDATION_PLATFORM_SOURCE}
-	${PXFOUNDATION_UWP_PLATFORM_SOURCE}
-	${PXFOUNDATION_PLATFORM_SOURCE_HEADERS}
-	${PXFOUNDATION_RESOURCE_FILE}
-)
-
-SET(PXFOUNDATION_PLATFORM_INCLUDES
-	${LL_SOURCE_DIR}/include/windows
-)
-
-SET(PXFOUNDATION_COMPILE_DEFS
-	# Common to all configurations
-	${PXSHARED_UWP_COMPILE_DEFS};PX_FOUNDATION_DLL=1;
-
-	$<$<CONFIG:debug>:${PXSHARED_UWP_DEBUG_COMPILE_DEFS};>
-	$<$<CONFIG:checked>:${PXSHARED_UWP_CHECKED_COMPILE_DEFS};>
-	$<$<CONFIG:profile>:${PXSHARED_UWP_PROFILE_COMPILE_DEFS};>
-	$<$<CONFIG:release>:${PXSHARED_UWP_RELEASE_COMPILE_DEFS};>
-)
-
-SET(PXFOUNDATION_PLATFORM_INTERFACE_HEADERS	"$<INSTALL_INTERFACE:include/foundation/windows>$<BUILD_INTERFACE:${PXSHARED_ROOT_DIR}/include/foundation/windows>")
-