Merge request #17 PhysX4 compatibilityv1.1.7_rc1

Other changes for linux and UE4CrossCompileLinux, and all packaging to work

6 files changed, 53 insertions, 15 deletions

diff --git a/tools/AuthoringTool/src/AuthoringTool.cpp b/tools/AuthoringTool/src/AuthoringTool.cpp
index 76574f3..4a94ae3 100755
--- a/tools/AuthoringTool/src/AuthoringTool.cpp
+++ b/tools/AuthoringTool/src/AuthoringTool.cpp
@@ -241,7 +241,7 @@ unsigned char *LoadBitmapFile(const char *filename, BITMAPINFOHEADER *bitmapInfo
 

 bool initPhysX()

 {

-	gFoundation = PxCreateFoundation(PX_FOUNDATION_VERSION, NvBlastGetPxAllocatorCallback(), NvBlastGetPxErrorCallback());

+	gFoundation = PxCreateFoundation(PX_PHYSICS_VERSION, NvBlastGetPxAllocatorCallback(), NvBlastGetPxErrorCallback());

 	if (!gFoundation)

 	{

 		std::cerr << "Can't init PhysX foundation" << std::endl;

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 6bb6507..0f39b12 100755
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -59,9 +59,9 @@ ENDIF()
 IF (APPEND_CONFIG_NAME)

 	MESSAGE("Appending config to output names")

 

-	SET(CMAKE_DEBUG_POSTFIX "DEBUG")

-	SET(CMAKE_PROFILE_POSTFIX "PROFILE")

-	SET(CMAKE_CHECKED_POSTFIX "CHECKED")

+	SET(CMAKE_DEBUG_POSTFIX "")

+	SET(CMAKE_PROFILE_POSTFIX "")

+	SET(CMAKE_CHECKED_POSTFIX "")

 	SET(CMAKE_RELEASE_POSTFIX "")

 ENDIF()

 

diff --git a/tools/LegacyConverter/src/Main.cpp b/tools/LegacyConverter/src/Main.cpp
index cc66b42..d0dde48 100755
--- a/tools/LegacyConverter/src/Main.cpp
+++ b/tools/LegacyConverter/src/Main.cpp
@@ -47,7 +47,6 @@
 #include "NvBlastExtSerializationInternal.h"

 #include "NvBlastPxCallbacks.h"

 #include "PxFoundation.h"

-#include "PxFoundationVersion.h"

 #include "PxPhysicsVersion.h"

 

 

@@ -108,7 +107,7 @@ static int init_framework()
 		NvBlastExtTkSerializerLoadSet(*sFwk, *sSer);

 	}

 

-	sFnd = PxCreateFoundation(PX_FOUNDATION_VERSION, NvBlastGetPxAllocatorCallback(), NvBlastGetPxErrorCallback());

+	sFnd = PxCreateFoundation(PX_PHYSICS_VERSION, NvBlastGetPxAllocatorCallback(), NvBlastGetPxErrorCallback());

 	if (sFnd != nullptr)

 	{

 		PxTolerancesScale tol;

diff --git a/tools/compiler/cmake/ApexImporter.cmake b/tools/compiler/cmake/ApexImporter.cmake
index 7ab0907..93cddb6 100755
--- a/tools/compiler/cmake/ApexImporter.cmake
+++ b/tools/compiler/cmake/ApexImporter.cmake
@@ -7,8 +7,8 @@ SET(TOOLS_COMMON_DIR ${BLAST_ROOT_DIR}/tools/common)
 SET(TOOLS_COMMON_DIR ${BLAST_ROOT_DIR}/tools/common)

 SET(APEX_MODULES_DIR ${BLAST_ROOT_DIR}/sdk/extensions/import/apexmodules)

 

-FIND_PACKAGE(PhysXSDK $ENV{PM_PhysX_VERSION} REQUIRED)

-FIND_PACKAGE(PxSharedSDK $ENV{PM_PxShared_VERSION} REQUIRED)

+FIND_PACKAGE(PxSharedSDK ${PM_physxsdk_VERSION} REQUIRED)

+FIND_PACKAGE(PhysXSDK ${PM_pxshared_VERSION} REQUIRED)

 FIND_PACKAGE(tclap $ENV{PM_tclap_VERSION} REQUIRED)

 FIND_PACKAGE(FBXSDK $ENV{PM_FBXSDK_VERSION} REQUIRED)

 

@@ -66,6 +66,18 @@ SET_TARGET_PROPERTIES(ApexImporter PROPERTIES
 	COMPILE_PDB_NAME_CHECKED "ApexImporter${CMAKE_CHECKED_POSTFIX}"

 	COMPILE_PDB_NAME_PROFILE "ApexImporter${CMAKE_PROFILE_POSTFIX}"

 	COMPILE_PDB_NAME_RELEASE "ApexImporter${CMAKE_RELEASE_POSTFIX}"

+    ARCHIVE_OUTPUT_DIRECTORY_DEBUG "${BL_LIB_OUTPUT_DIR}/debug"

+    LIBRARY_OUTPUT_DIRECTORY_DEBUG "${BL_DLL_OUTPUT_DIR}/debug"

+    RUNTIME_OUTPUT_DIRECTORY_DEBUG "${BL_EXE_OUTPUT_DIR}/debug"

+    ARCHIVE_OUTPUT_DIRECTORY_CHECKED "${BL_LIB_OUTPUT_DIR}/checked"

+    LIBRARY_OUTPUT_DIRECTORY_CHECKED "${BL_DLL_OUTPUT_DIR}/checked"

+    RUNTIME_OUTPUT_DIRECTORY_CHECKED "${BL_EXE_OUTPUT_DIR}/checked"

+    ARCHIVE_OUTPUT_DIRECTORY_PROFILE "${BL_LIB_OUTPUT_DIR}/profile"

+    LIBRARY_OUTPUT_DIRECTORY_PROFILE "${BL_DLL_OUTPUT_DIR}/profile"

+    RUNTIME_OUTPUT_DIRECTORY_PROFILE "${BL_EXE_OUTPUT_DIR}/profile"

+    ARCHIVE_OUTPUT_DIRECTORY_RELEASE "${BL_LIB_OUTPUT_DIR}/release"

+    LIBRARY_OUTPUT_DIRECTORY_RELEASE "${BL_DLL_OUTPUT_DIR}/release"

+    RUNTIME_OUTPUT_DIRECTORY_RELEASE "${BL_EXE_OUTPUT_DIR}/release"

 )

 

 # Do final direct sets after the target has been defined

@@ -76,6 +88,7 @@ TARGET_LINK_LIBRARIES(ApexImporter
 

 ADD_CUSTOM_COMMAND(TARGET ApexImporter POST_BUILD

 	COMMAND ${CMAKE_COMMAND} -E copy_if_different 

-	${PHYSXSDK_DLLS} ${PXSHAREDSDK_DLLS}

+	${PHYSXSDK_DLLS}

 	${BL_EXE_OUTPUT_DIR}

+	$<TARGET_FILE_DIR:ApexImporter>

 )

diff --git a/tools/compiler/cmake/AuthoringTool.cmake b/tools/compiler/cmake/AuthoringTool.cmake
index 3b16da0..399cf3f 100755
--- a/tools/compiler/cmake/AuthoringTool.cmake
+++ b/tools/compiler/cmake/AuthoringTool.cmake
@@ -8,8 +8,8 @@ SET(TOOLS_COMMON_SOURCE_DIR ${PROJECT_SOURCE_DIR}/common)
 SET(EXT_AUTHORING_INCLUDE_DIR ${BLAST_ROOT_DIR}/sdk/extensions/authoring/include)

 SET(TK_INCLUDE_DIR ${BLAST_ROOT_DIR}/sdk/toolkit/include)

 

-FIND_PACKAGE(PhysXSDK $ENV{PM_PhysXSDK_VERSION} REQUIRED)

-FIND_PACKAGE(PxSharedSDK $ENV{PM_PxSharedSDK_VERSION} REQUIRED)

+FIND_PACKAGE(PhysXSDK REQUIRED)

+FIND_PACKAGE(PxSharedSDK REQUIRED)

 FIND_PACKAGE(tclap $ENV{PM_tclap_VERSION} REQUIRED)

 FIND_PACKAGE(tinyObjLoader $ENV{PM_tinyObjLoader_VERSION} REQUIRED)

 FIND_PACKAGE(FBXSDK $ENV{PM_FBXSDK_VERSION} REQUIRED)

@@ -67,6 +67,18 @@ SET_TARGET_PROPERTIES(AuthoringTool PROPERTIES
 	PDB_NAME_CHECKED "AuthoringTool${CMAKE_CHECKED_POSTFIX}"

 	PDB_NAME_PROFILE "AuthoringTool${CMAKE_PROFILE_POSTFIX}"

 	PDB_NAME_RELEASE "AuthoringTool${CMAKE_RELEASE_POSTFIX}"

+    ARCHIVE_OUTPUT_DIRECTORY_DEBUG "${BL_LIB_OUTPUT_DIR}/debug"

+    LIBRARY_OUTPUT_DIRECTORY_DEBUG "${BL_DLL_OUTPUT_DIR}/debug"

+    RUNTIME_OUTPUT_DIRECTORY_DEBUG "${BL_EXE_OUTPUT_DIR}/debug"

+    ARCHIVE_OUTPUT_DIRECTORY_CHECKED "${BL_LIB_OUTPUT_DIR}/checked"

+    LIBRARY_OUTPUT_DIRECTORY_CHECKED "${BL_DLL_OUTPUT_DIR}/checked"

+    RUNTIME_OUTPUT_DIRECTORY_CHECKED "${BL_EXE_OUTPUT_DIR}/checked"

+    ARCHIVE_OUTPUT_DIRECTORY_PROFILE "${BL_LIB_OUTPUT_DIR}/profile"

+    LIBRARY_OUTPUT_DIRECTORY_PROFILE "${BL_DLL_OUTPUT_DIR}/profile"

+    RUNTIME_OUTPUT_DIRECTORY_PROFILE "${BL_EXE_OUTPUT_DIR}/profile"

+    ARCHIVE_OUTPUT_DIRECTORY_RELEASE "${BL_LIB_OUTPUT_DIR}/release"

+    LIBRARY_OUTPUT_DIRECTORY_RELEASE "${BL_DLL_OUTPUT_DIR}/release"

+    RUNTIME_OUTPUT_DIRECTORY_RELEASE "${BL_EXE_OUTPUT_DIR}/release"

 )

 

 # Do final direct sets after the target has been defined

@@ -79,7 +91,8 @@ TARGET_LINK_LIBRARIES(AuthoringTool
 

 ADD_CUSTOM_COMMAND(TARGET AuthoringTool POST_BUILD

 	COMMAND ${CMAKE_COMMAND} -E copy_if_different 

-	${APEXSDK_DLLS} ${PHYSXSDK_DLLS} ${PXSHAREDSDK_DLLS}

+	${APEXSDK_DLLS} ${PHYSXSDK_DLLS}

 	${BL_EXE_OUTPUT_DIR}

+	$<TARGET_FILE_DIR:AuthoringTool>

 )

 

diff --git a/tools/compiler/cmake/LegacyConverter.cmake b/tools/compiler/cmake/LegacyConverter.cmake
index 7a2c959..53912c2 100755
--- a/tools/compiler/cmake/LegacyConverter.cmake
+++ b/tools/compiler/cmake/LegacyConverter.cmake
@@ -5,8 +5,8 @@
 SET(LEGACYCONVERTER_SOURCE_DIR ${PROJECT_SOURCE_DIR}/LegacyConverter/src)

 

 FIND_PACKAGE(tclap $ENV{PM_tclap_VERSION} REQUIRED)

-FIND_PACKAGE(PhysXSDK $ENV{PM_PhysX_VERSION} REQUIRED)

-FIND_PACKAGE(PxSharedSDK $ENV{PM_PxShared_VERSION} REQUIRED)

+FIND_PACKAGE(PxSharedSDK ${PM_physxsdk_VERSION} REQUIRED)

+FIND_PACKAGE(PhysXSDK ${PM_pxshared_VERSION} REQUIRED)

 

 # Include here after the directories are defined so that the platform specific file can use the variables.

 include(${PROJECT_CMAKE_FILES_DIR}/${TARGET_BUILD_PLATFORM}/LegacyConverter.cmake)

@@ -50,6 +50,18 @@ SET_TARGET_PROPERTIES(LegacyConverter PROPERTIES
 	PDB_NAME_CHECKED "LegacyConverter${CMAKE_CHECKED_POSTFIX}"

 	PDB_NAME_PROFILE "LegacyConverter${CMAKE_PROFILE_POSTFIX}"

 	PDB_NAME_RELEASE "LegacyConverter${CMAKE_RELEASE_POSTFIX}"

+    ARCHIVE_OUTPUT_DIRECTORY_DEBUG "${BL_LIB_OUTPUT_DIR}/debug"

+    LIBRARY_OUTPUT_DIRECTORY_DEBUG "${BL_DLL_OUTPUT_DIR}/debug"

+    RUNTIME_OUTPUT_DIRECTORY_DEBUG "${BL_EXE_OUTPUT_DIR}/debug"

+    ARCHIVE_OUTPUT_DIRECTORY_CHECKED "${BL_LIB_OUTPUT_DIR}/checked"

+    LIBRARY_OUTPUT_DIRECTORY_CHECKED "${BL_DLL_OUTPUT_DIR}/checked"

+    RUNTIME_OUTPUT_DIRECTORY_CHECKED "${BL_EXE_OUTPUT_DIR}/checked"

+    ARCHIVE_OUTPUT_DIRECTORY_PROFILE "${BL_LIB_OUTPUT_DIR}/profile"

+    LIBRARY_OUTPUT_DIRECTORY_PROFILE "${BL_DLL_OUTPUT_DIR}/profile"

+    RUNTIME_OUTPUT_DIRECTORY_PROFILE "${BL_EXE_OUTPUT_DIR}/profile"

+    ARCHIVE_OUTPUT_DIRECTORY_RELEASE "${BL_LIB_OUTPUT_DIR}/release"

+    LIBRARY_OUTPUT_DIRECTORY_RELEASE "${BL_DLL_OUTPUT_DIR}/release"

+    RUNTIME_OUTPUT_DIRECTORY_RELEASE "${BL_EXE_OUTPUT_DIR}/release"

 )

 

 # Do final direct sets after the target has been defined

@@ -58,6 +70,7 @@ TARGET_LINK_LIBRARIES(LegacyConverter NvBlast NvBlastTk NvBlastExtPhysX NvBlastE
 

 ADD_CUSTOM_COMMAND(TARGET LegacyConverter POST_BUILD

 	COMMAND ${CMAKE_COMMAND} -E copy_if_different 

-	${PHYSXSDK_DLLS} ${PXSHAREDSDK_DLLS}

+	${PHYSXSDK_DLLS}

 	${BL_EXE_OUTPUT_DIR}

+	$<TARGET_FILE_DIR:LegacyConverter>

 )