Merge request #17 PhysX4 compatibilityv1.1.7_rc1

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

1 files changed, 16 insertions, 3 deletions

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>

 )