diff options
Diffstat (limited to 'PhysX_3.4/Samples')
9 files changed, 26 insertions, 27 deletions
diff --git a/PhysX_3.4/Samples/PxToolkit/include/PxTkFile.h b/PhysX_3.4/Samples/PxToolkit/include/PxTkFile.h index 0113bbcd..2ec6fc3c 100644 --- a/PhysX_3.4/Samples/PxToolkit/include/PxTkFile.h +++ b/PhysX_3.4/Samples/PxToolkit/include/PxTkFile.h @@ -56,7 +56,7 @@ PX_INLINE physx::PxI32 fopen_s(FILE** file, const char* name, const char* mode) } // namespace PxToolkit -#elif PX_UNIX_FAMILY || PX_PS4 || PX_NX +#elif PX_UNIX_FAMILY || PX_PS4 || PX_SWITCH #include <stdio.h> diff --git a/PhysX_3.4/Samples/SampleBase/PhysXSampleApplication.cpp b/PhysX_3.4/Samples/SampleBase/PhysXSampleApplication.cpp index 6a3ae127..c926291b 100644 --- a/PhysX_3.4/Samples/SampleBase/PhysXSampleApplication.cpp +++ b/PhysX_3.4/Samples/SampleBase/PhysXSampleApplication.cpp @@ -710,7 +710,6 @@ void PhysXSampleApplication::onRender() for(PxU32 i=0;i<8;i++) cameraBounds.include(frustumVerts[i]); mScene->setVisualizationCullingBox(cameraBounds); - mScene->setVisualizationParameter(PxVisualizationParameter::eCULL_BOX, 1.0f); } #endif renderer->clearBuffers(); diff --git a/PhysX_3.4/Samples/SampleBase/SampleAllocator.cpp b/PhysX_3.4/Samples/SampleBase/SampleAllocator.cpp index 8e54221a..cca4c7a6 100644 --- a/PhysX_3.4/Samples/SampleBase/SampleAllocator.cpp +++ b/PhysX_3.4/Samples/SampleBase/SampleAllocator.cpp @@ -165,7 +165,7 @@ PxSampleAllocator::~PxSampleAllocator() continue; const DebugBlock* DB = (const DebugBlock*)mMemBlockList[i]; - sprintf(buffer, " Address 0x%p, %d bytes, allocated in: %s(%d):\n\n", DB+1, DB->mSize, DB->mFilename, DB->mLine); + sprintf(buffer, " Address 0x%p, %d bytes, allocated in: %s(%d):\n\n", (void*)(DB+1), DB->mSize, DB->mFilename, DB->mLine); print(buffer); NbLeaks++; diff --git a/PhysX_3.4/Samples/compiler/vc11win32/Samples.vcxproj b/PhysX_3.4/Samples/compiler/vc11win32/Samples.vcxproj index 8e4116b6..ab3e4f43 100644 --- a/PhysX_3.4/Samples/compiler/vc11win32/Samples.vcxproj +++ b/PhysX_3.4/Samples/compiler/vc11win32/Samples.vcxproj @@ -85,7 +85,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Link> - <AdditionalOptions>Winmm.lib /LIBPATH:../../lib/vc11win32 /LIBPATH:../../../../PxShared/lib/vc11win32 /LIBPATH:../../../Lib/vc11win32 PhysX3CommonDEBUG_x86.lib PhysX3DEBUG_x86.lib PhysX3CookingDEBUG_x86.lib PhysX3CharacterKinematicDEBUG_x86.lib PhysX3ExtensionsDEBUG.lib PhysX3VehicleDEBUG.lib PxPvdSDKDEBUG_x86.lib PxTaskDEBUG_x86.lib PxCudaContextManagerDEBUG_x86.lib PxFoundationDEBUG_x86.lib PsFastXmlDEBUG_x86.lib /DEBUG</AdditionalOptions> + <AdditionalOptions>Winmm.lib /LIBPATH:../../lib/vc11win32 /LIBPATH:../../../../PxShared/lib/vc11win32 /LIBPATH:../../../Lib/vc11win32 PhysX3CommonDEBUG_x86.lib PhysX3DEBUG_x86.lib PhysX3CookingDEBUG_x86.lib PhysX3CharacterKinematicDEBUG_x86.lib PhysX3ExtensionsDEBUG.lib PhysX3VehicleDEBUG.lib PxPvdSDKDEBUG_x86.lib PxTaskDEBUG_x86.lib PxFoundationDEBUG_x86.lib PsFastXmlDEBUG_x86.lib /DEBUG</AdditionalOptions> <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(ProjectName)DEBUG.exe</OutputFile> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> @@ -133,7 +133,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Link> - <AdditionalOptions>Winmm.lib /LIBPATH:../../lib/vc11win32 /LIBPATH:../../../../PxShared/lib/vc11win32 /LIBPATH:../../../Lib/vc11win32 PhysX3CommonCHECKED_x86.lib PhysX3CHECKED_x86.lib PhysX3CookingCHECKED_x86.lib PhysX3CharacterKinematicCHECKED_x86.lib PhysX3ExtensionsCHECKED.lib PhysX3VehicleCHECKED.lib PxPvdSDKCHECKED_x86.lib PxTaskCHECKED_x86.lib PxCudaContextManagerCHECKED_x86.lib PxFoundationCHECKED_x86.lib PsFastXmlCHECKED_x86.lib</AdditionalOptions> + <AdditionalOptions>Winmm.lib /LIBPATH:../../lib/vc11win32 /LIBPATH:../../../../PxShared/lib/vc11win32 /LIBPATH:../../../Lib/vc11win32 PhysX3CommonCHECKED_x86.lib PhysX3CHECKED_x86.lib PhysX3CookingCHECKED_x86.lib PhysX3CharacterKinematicCHECKED_x86.lib PhysX3ExtensionsCHECKED.lib PhysX3VehicleCHECKED.lib PxPvdSDKCHECKED_x86.lib PxTaskCHECKED_x86.lib PxFoundationCHECKED_x86.lib PsFastXmlCHECKED_x86.lib</AdditionalOptions> <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(ProjectName)CHECKED.exe</OutputFile> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> @@ -181,7 +181,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Link> - <AdditionalOptions>Winmm.lib /LIBPATH:../../lib/vc11win32 /LIBPATH:../../../../PxShared/lib/vc11win32 /INCREMENTAL:NO /LIBPATH:../../../Lib/vc11win32 PhysX3CommonPROFILE_x86.lib PhysX3PROFILE_x86.lib PhysX3CookingPROFILE_x86.lib PhysX3CharacterKinematicPROFILE_x86.lib PhysX3ExtensionsPROFILE.lib PhysX3VehiclePROFILE.lib PxPvdSDKPROFILE_x86.lib PxTaskPROFILE_x86.lib PxCudaContextManagerPROFILE_x86.lib PxFoundationPROFILE_x86.lib PsFastXmlPROFILE_x86.lib /DEBUG</AdditionalOptions> + <AdditionalOptions>Winmm.lib /LIBPATH:../../lib/vc11win32 /LIBPATH:../../../../PxShared/lib/vc11win32 /INCREMENTAL:NO /LIBPATH:../../../Lib/vc11win32 PhysX3CommonPROFILE_x86.lib PhysX3PROFILE_x86.lib PhysX3CookingPROFILE_x86.lib PhysX3CharacterKinematicPROFILE_x86.lib PhysX3ExtensionsPROFILE.lib PhysX3VehiclePROFILE.lib PxPvdSDKPROFILE_x86.lib PxTaskPROFILE_x86.lib PxFoundationPROFILE_x86.lib PsFastXmlPROFILE_x86.lib /DEBUG</AdditionalOptions> <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(ProjectName)PROFILE.exe</OutputFile> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> @@ -229,7 +229,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Link> - <AdditionalOptions>Winmm.lib /LIBPATH:../../lib/vc11win32 /LIBPATH:../../../../PxShared/lib/vc11win32 /INCREMENTAL:NO /LIBPATH:../../../Lib/vc11win32 PhysX3Common_x86.lib PhysX3_x86.lib PhysX3Cooking_x86.lib PhysX3CharacterKinematic_x86.lib PhysX3Extensions.lib PhysX3Vehicle.lib PxPvdSDK_x86.lib PxTask_x86.lib PxCudaContextManager_x86.lib PxFoundation_x86.lib PsFastXml_x86.lib</AdditionalOptions> + <AdditionalOptions>Winmm.lib /LIBPATH:../../lib/vc11win32 /LIBPATH:../../../../PxShared/lib/vc11win32 /INCREMENTAL:NO /LIBPATH:../../../Lib/vc11win32 PhysX3Common_x86.lib PhysX3_x86.lib PhysX3Cooking_x86.lib PhysX3CharacterKinematic_x86.lib PhysX3Extensions.lib PhysX3Vehicle.lib PxPvdSDK_x86.lib PxTask_x86.lib PxFoundation_x86.lib PsFastXml_x86.lib</AdditionalOptions> <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> diff --git a/PhysX_3.4/Samples/compiler/vc11win64/Samples.vcxproj b/PhysX_3.4/Samples/compiler/vc11win64/Samples.vcxproj index 730f98cc..6a97a8e4 100644 --- a/PhysX_3.4/Samples/compiler/vc11win64/Samples.vcxproj +++ b/PhysX_3.4/Samples/compiler/vc11win64/Samples.vcxproj @@ -84,7 +84,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Link> - <AdditionalOptions>Winmm.lib /LIBPATH:../../lib/vc11win64 /LIBPATH:../../../../PxShared/lib/vc11win64 /LIBPATH:../../../Lib/vc11win64 PhysX3CommonDEBUG_x64.lib PhysX3DEBUG_x64.lib PhysX3CookingDEBUG_x64.lib PhysX3CharacterKinematicDEBUG_x64.lib PhysX3ExtensionsDEBUG.lib PhysX3VehicleDEBUG.lib PxPvdSDKDEBUG_x64.lib PxTaskDEBUG_x64.lib PxCudaContextManagerDEBUG_x64.lib PxFoundationDEBUG_x64.lib PsFastXmlDEBUG_x64.lib /DEBUG</AdditionalOptions> + <AdditionalOptions>Winmm.lib /LIBPATH:../../lib/vc11win64 /LIBPATH:../../../../PxShared/lib/vc11win64 /LIBPATH:../../../Lib/vc11win64 PhysX3CommonDEBUG_x64.lib PhysX3DEBUG_x64.lib PhysX3CookingDEBUG_x64.lib PhysX3CharacterKinematicDEBUG_x64.lib PhysX3ExtensionsDEBUG.lib PhysX3VehicleDEBUG.lib PxPvdSDKDEBUG_x64.lib PxTaskDEBUG_x64.lib PxFoundationDEBUG_x64.lib PsFastXmlDEBUG_x64.lib /DEBUG</AdditionalOptions> <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(ProjectName)DEBUG.exe</OutputFile> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> @@ -131,7 +131,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Link> - <AdditionalOptions>Winmm.lib /LIBPATH:../../lib/vc11win64 /LIBPATH:../../../../PxShared/lib/vc11win64 /LIBPATH:../../../Lib/vc11win64 PhysX3CommonCHECKED_x64.lib PhysX3CHECKED_x64.lib PhysX3CookingCHECKED_x64.lib PhysX3CharacterKinematicCHECKED_x64.lib PhysX3ExtensionsCHECKED.lib PhysX3VehicleCHECKED.lib PxPvdSDKCHECKED_x64.lib PxTaskCHECKED_x64.lib PxCudaContextManagerCHECKED_x64.lib PxFoundationCHECKED_x64.lib PsFastXmlCHECKED_x64.lib</AdditionalOptions> + <AdditionalOptions>Winmm.lib /LIBPATH:../../lib/vc11win64 /LIBPATH:../../../../PxShared/lib/vc11win64 /LIBPATH:../../../Lib/vc11win64 PhysX3CommonCHECKED_x64.lib PhysX3CHECKED_x64.lib PhysX3CookingCHECKED_x64.lib PhysX3CharacterKinematicCHECKED_x64.lib PhysX3ExtensionsCHECKED.lib PhysX3VehicleCHECKED.lib PxPvdSDKCHECKED_x64.lib PxTaskCHECKED_x64.lib PxFoundationCHECKED_x64.lib PsFastXmlCHECKED_x64.lib</AdditionalOptions> <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(ProjectName)CHECKED.exe</OutputFile> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> @@ -178,7 +178,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Link> - <AdditionalOptions>Winmm.lib /LIBPATH:../../lib/vc11win64 /LIBPATH:../../../../PxShared/lib/vc11win64 /INCREMENTAL:NO /LIBPATH:../../../Lib/vc11win64 PhysX3CommonPROFILE_x64.lib PhysX3PROFILE_x64.lib PhysX3CookingPROFILE_x64.lib PhysX3CharacterKinematicPROFILE_x64.lib PhysX3ExtensionsPROFILE.lib PhysX3VehiclePROFILE.lib PxPvdSDKPROFILE_x64.lib PxTaskPROFILE_x64.lib PxCudaContextManagerPROFILE_x64.lib PxFoundationPROFILE_x64.lib PsFastXmlPROFILE_x64.lib /DEBUG</AdditionalOptions> + <AdditionalOptions>Winmm.lib /LIBPATH:../../lib/vc11win64 /LIBPATH:../../../../PxShared/lib/vc11win64 /INCREMENTAL:NO /LIBPATH:../../../Lib/vc11win64 PhysX3CommonPROFILE_x64.lib PhysX3PROFILE_x64.lib PhysX3CookingPROFILE_x64.lib PhysX3CharacterKinematicPROFILE_x64.lib PhysX3ExtensionsPROFILE.lib PhysX3VehiclePROFILE.lib PxPvdSDKPROFILE_x64.lib PxTaskPROFILE_x64.lib PxFoundationPROFILE_x64.lib PsFastXmlPROFILE_x64.lib /DEBUG</AdditionalOptions> <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(ProjectName)PROFILE.exe</OutputFile> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> @@ -225,7 +225,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Link> - <AdditionalOptions>Winmm.lib /LIBPATH:../../lib/vc11win64 /LIBPATH:../../../../PxShared/lib/vc11win64 /INCREMENTAL:NO /LIBPATH:../../../Lib/vc11win64 PhysX3Common_x64.lib PhysX3_x64.lib PhysX3Cooking_x64.lib PhysX3CharacterKinematic_x64.lib PhysX3Extensions.lib PhysX3Vehicle.lib PxPvdSDK_x64.lib PxTask_x64.lib PxCudaContextManager_x64.lib PxFoundation_x64.lib PsFastXml_x64.lib</AdditionalOptions> + <AdditionalOptions>Winmm.lib /LIBPATH:../../lib/vc11win64 /LIBPATH:../../../../PxShared/lib/vc11win64 /INCREMENTAL:NO /LIBPATH:../../../Lib/vc11win64 PhysX3Common_x64.lib PhysX3_x64.lib PhysX3Cooking_x64.lib PhysX3CharacterKinematic_x64.lib PhysX3Extensions.lib PhysX3Vehicle.lib PxPvdSDK_x64.lib PxTask_x64.lib PxFoundation_x64.lib PsFastXml_x64.lib</AdditionalOptions> <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> diff --git a/PhysX_3.4/Samples/compiler/vc12win32/Samples.vcxproj b/PhysX_3.4/Samples/compiler/vc12win32/Samples.vcxproj index ab57ca23..66e746cf 100644 --- a/PhysX_3.4/Samples/compiler/vc12win32/Samples.vcxproj +++ b/PhysX_3.4/Samples/compiler/vc12win32/Samples.vcxproj @@ -85,7 +85,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Link> - <AdditionalOptions>Winmm.lib /LIBPATH:../../lib/vc12win32 /LIBPATH:../../../../PxShared/lib/vc12win32 /LIBPATH:../../../Lib/vc12win32 PhysX3CommonDEBUG_x86.lib PhysX3DEBUG_x86.lib PhysX3CookingDEBUG_x86.lib PhysX3CharacterKinematicDEBUG_x86.lib PhysX3ExtensionsDEBUG.lib PhysX3VehicleDEBUG.lib PxPvdSDKDEBUG_x86.lib PxTaskDEBUG_x86.lib PxCudaContextManagerDEBUG_x86.lib PxFoundationDEBUG_x86.lib PsFastXmlDEBUG_x86.lib /DEBUG</AdditionalOptions> + <AdditionalOptions>Winmm.lib /LIBPATH:../../lib/vc12win32 /LIBPATH:../../../../PxShared/lib/vc12win32 /LIBPATH:../../../Lib/vc12win32 PhysX3CommonDEBUG_x86.lib PhysX3DEBUG_x86.lib PhysX3CookingDEBUG_x86.lib PhysX3CharacterKinematicDEBUG_x86.lib PhysX3ExtensionsDEBUG.lib PhysX3VehicleDEBUG.lib PxPvdSDKDEBUG_x86.lib PxTaskDEBUG_x86.lib PxFoundationDEBUG_x86.lib PsFastXmlDEBUG_x86.lib /DEBUG</AdditionalOptions> <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(ProjectName)DEBUG.exe</OutputFile> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> @@ -133,7 +133,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Link> - <AdditionalOptions>Winmm.lib /LIBPATH:../../lib/vc12win32 /LIBPATH:../../../../PxShared/lib/vc12win32 /LIBPATH:../../../Lib/vc12win32 PhysX3CommonCHECKED_x86.lib PhysX3CHECKED_x86.lib PhysX3CookingCHECKED_x86.lib PhysX3CharacterKinematicCHECKED_x86.lib PhysX3ExtensionsCHECKED.lib PhysX3VehicleCHECKED.lib PxPvdSDKCHECKED_x86.lib PxTaskCHECKED_x86.lib PxCudaContextManagerCHECKED_x86.lib PxFoundationCHECKED_x86.lib PsFastXmlCHECKED_x86.lib</AdditionalOptions> + <AdditionalOptions>Winmm.lib /LIBPATH:../../lib/vc12win32 /LIBPATH:../../../../PxShared/lib/vc12win32 /LIBPATH:../../../Lib/vc12win32 PhysX3CommonCHECKED_x86.lib PhysX3CHECKED_x86.lib PhysX3CookingCHECKED_x86.lib PhysX3CharacterKinematicCHECKED_x86.lib PhysX3ExtensionsCHECKED.lib PhysX3VehicleCHECKED.lib PxPvdSDKCHECKED_x86.lib PxTaskCHECKED_x86.lib PxFoundationCHECKED_x86.lib PsFastXmlCHECKED_x86.lib</AdditionalOptions> <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(ProjectName)CHECKED.exe</OutputFile> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> @@ -181,7 +181,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Link> - <AdditionalOptions>Winmm.lib /LIBPATH:../../lib/vc12win32 /LIBPATH:../../../../PxShared/lib/vc12win32 /INCREMENTAL:NO /LIBPATH:../../../Lib/vc12win32 PhysX3CommonPROFILE_x86.lib PhysX3PROFILE_x86.lib PhysX3CookingPROFILE_x86.lib PhysX3CharacterKinematicPROFILE_x86.lib PhysX3ExtensionsPROFILE.lib PhysX3VehiclePROFILE.lib PxPvdSDKPROFILE_x86.lib PxTaskPROFILE_x86.lib PxCudaContextManagerPROFILE_x86.lib PxFoundationPROFILE_x86.lib PsFastXmlPROFILE_x86.lib /DEBUG</AdditionalOptions> + <AdditionalOptions>Winmm.lib /LIBPATH:../../lib/vc12win32 /LIBPATH:../../../../PxShared/lib/vc12win32 /INCREMENTAL:NO /LIBPATH:../../../Lib/vc12win32 PhysX3CommonPROFILE_x86.lib PhysX3PROFILE_x86.lib PhysX3CookingPROFILE_x86.lib PhysX3CharacterKinematicPROFILE_x86.lib PhysX3ExtensionsPROFILE.lib PhysX3VehiclePROFILE.lib PxPvdSDKPROFILE_x86.lib PxTaskPROFILE_x86.lib PxFoundationPROFILE_x86.lib PsFastXmlPROFILE_x86.lib /DEBUG</AdditionalOptions> <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(ProjectName)PROFILE.exe</OutputFile> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> @@ -229,7 +229,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Link> - <AdditionalOptions>Winmm.lib /LIBPATH:../../lib/vc12win32 /LIBPATH:../../../../PxShared/lib/vc12win32 /INCREMENTAL:NO /LIBPATH:../../../Lib/vc12win32 PhysX3Common_x86.lib PhysX3_x86.lib PhysX3Cooking_x86.lib PhysX3CharacterKinematic_x86.lib PhysX3Extensions.lib PhysX3Vehicle.lib PxPvdSDK_x86.lib PxTask_x86.lib PxCudaContextManager_x86.lib PxFoundation_x86.lib PsFastXml_x86.lib</AdditionalOptions> + <AdditionalOptions>Winmm.lib /LIBPATH:../../lib/vc12win32 /LIBPATH:../../../../PxShared/lib/vc12win32 /INCREMENTAL:NO /LIBPATH:../../../Lib/vc12win32 PhysX3Common_x86.lib PhysX3_x86.lib PhysX3Cooking_x86.lib PhysX3CharacterKinematic_x86.lib PhysX3Extensions.lib PhysX3Vehicle.lib PxPvdSDK_x86.lib PxTask_x86.lib PxFoundation_x86.lib PsFastXml_x86.lib</AdditionalOptions> <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> diff --git a/PhysX_3.4/Samples/compiler/vc12win64/Samples.vcxproj b/PhysX_3.4/Samples/compiler/vc12win64/Samples.vcxproj index 38c2b8ef..80587881 100644 --- a/PhysX_3.4/Samples/compiler/vc12win64/Samples.vcxproj +++ b/PhysX_3.4/Samples/compiler/vc12win64/Samples.vcxproj @@ -84,7 +84,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Link> - <AdditionalOptions>Winmm.lib /LIBPATH:../../lib/vc12win64 /LIBPATH:../../../../PxShared/lib/vc12win64 /LIBPATH:../../../Lib/vc12win64 PhysX3CommonDEBUG_x64.lib PhysX3DEBUG_x64.lib PhysX3CookingDEBUG_x64.lib PhysX3CharacterKinematicDEBUG_x64.lib PhysX3ExtensionsDEBUG.lib PhysX3VehicleDEBUG.lib PxPvdSDKDEBUG_x64.lib PxTaskDEBUG_x64.lib PxCudaContextManagerDEBUG_x64.lib PxFoundationDEBUG_x64.lib PsFastXmlDEBUG_x64.lib /DEBUG</AdditionalOptions> + <AdditionalOptions>Winmm.lib /LIBPATH:../../lib/vc12win64 /LIBPATH:../../../../PxShared/lib/vc12win64 /LIBPATH:../../../Lib/vc12win64 PhysX3CommonDEBUG_x64.lib PhysX3DEBUG_x64.lib PhysX3CookingDEBUG_x64.lib PhysX3CharacterKinematicDEBUG_x64.lib PhysX3ExtensionsDEBUG.lib PhysX3VehicleDEBUG.lib PxPvdSDKDEBUG_x64.lib PxTaskDEBUG_x64.lib PxFoundationDEBUG_x64.lib PsFastXmlDEBUG_x64.lib /DEBUG</AdditionalOptions> <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(ProjectName)DEBUG.exe</OutputFile> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> @@ -131,7 +131,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Link> - <AdditionalOptions>Winmm.lib /LIBPATH:../../lib/vc12win64 /LIBPATH:../../../../PxShared/lib/vc12win64 /LIBPATH:../../../Lib/vc12win64 PhysX3CommonCHECKED_x64.lib PhysX3CHECKED_x64.lib PhysX3CookingCHECKED_x64.lib PhysX3CharacterKinematicCHECKED_x64.lib PhysX3ExtensionsCHECKED.lib PhysX3VehicleCHECKED.lib PxPvdSDKCHECKED_x64.lib PxTaskCHECKED_x64.lib PxCudaContextManagerCHECKED_x64.lib PxFoundationCHECKED_x64.lib PsFastXmlCHECKED_x64.lib</AdditionalOptions> + <AdditionalOptions>Winmm.lib /LIBPATH:../../lib/vc12win64 /LIBPATH:../../../../PxShared/lib/vc12win64 /LIBPATH:../../../Lib/vc12win64 PhysX3CommonCHECKED_x64.lib PhysX3CHECKED_x64.lib PhysX3CookingCHECKED_x64.lib PhysX3CharacterKinematicCHECKED_x64.lib PhysX3ExtensionsCHECKED.lib PhysX3VehicleCHECKED.lib PxPvdSDKCHECKED_x64.lib PxTaskCHECKED_x64.lib PxFoundationCHECKED_x64.lib PsFastXmlCHECKED_x64.lib</AdditionalOptions> <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(ProjectName)CHECKED.exe</OutputFile> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> @@ -178,7 +178,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Link> - <AdditionalOptions>Winmm.lib /LIBPATH:../../lib/vc12win64 /LIBPATH:../../../../PxShared/lib/vc12win64 /INCREMENTAL:NO /LIBPATH:../../../Lib/vc12win64 PhysX3CommonPROFILE_x64.lib PhysX3PROFILE_x64.lib PhysX3CookingPROFILE_x64.lib PhysX3CharacterKinematicPROFILE_x64.lib PhysX3ExtensionsPROFILE.lib PhysX3VehiclePROFILE.lib PxPvdSDKPROFILE_x64.lib PxTaskPROFILE_x64.lib PxCudaContextManagerPROFILE_x64.lib PxFoundationPROFILE_x64.lib PsFastXmlPROFILE_x64.lib /DEBUG</AdditionalOptions> + <AdditionalOptions>Winmm.lib /LIBPATH:../../lib/vc12win64 /LIBPATH:../../../../PxShared/lib/vc12win64 /INCREMENTAL:NO /LIBPATH:../../../Lib/vc12win64 PhysX3CommonPROFILE_x64.lib PhysX3PROFILE_x64.lib PhysX3CookingPROFILE_x64.lib PhysX3CharacterKinematicPROFILE_x64.lib PhysX3ExtensionsPROFILE.lib PhysX3VehiclePROFILE.lib PxPvdSDKPROFILE_x64.lib PxTaskPROFILE_x64.lib PxFoundationPROFILE_x64.lib PsFastXmlPROFILE_x64.lib /DEBUG</AdditionalOptions> <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(ProjectName)PROFILE.exe</OutputFile> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> @@ -225,7 +225,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Link> - <AdditionalOptions>Winmm.lib /LIBPATH:../../lib/vc12win64 /LIBPATH:../../../../PxShared/lib/vc12win64 /INCREMENTAL:NO /LIBPATH:../../../Lib/vc12win64 PhysX3Common_x64.lib PhysX3_x64.lib PhysX3Cooking_x64.lib PhysX3CharacterKinematic_x64.lib PhysX3Extensions.lib PhysX3Vehicle.lib PxPvdSDK_x64.lib PxTask_x64.lib PxCudaContextManager_x64.lib PxFoundation_x64.lib PsFastXml_x64.lib</AdditionalOptions> + <AdditionalOptions>Winmm.lib /LIBPATH:../../lib/vc12win64 /LIBPATH:../../../../PxShared/lib/vc12win64 /INCREMENTAL:NO /LIBPATH:../../../Lib/vc12win64 PhysX3Common_x64.lib PhysX3_x64.lib PhysX3Cooking_x64.lib PhysX3CharacterKinematic_x64.lib PhysX3Extensions.lib PhysX3Vehicle.lib PxPvdSDK_x64.lib PxTask_x64.lib PxFoundation_x64.lib PsFastXml_x64.lib</AdditionalOptions> <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> diff --git a/PhysX_3.4/Samples/compiler/vc14win32/Samples.vcxproj b/PhysX_3.4/Samples/compiler/vc14win32/Samples.vcxproj index a4923c50..0445e0ae 100644 --- a/PhysX_3.4/Samples/compiler/vc14win32/Samples.vcxproj +++ b/PhysX_3.4/Samples/compiler/vc14win32/Samples.vcxproj @@ -85,7 +85,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Link> - <AdditionalOptions>Winmm.lib /LIBPATH:../../lib/vc14win32 /LIBPATH:../../../../PxShared/lib/vc14win32 /LIBPATH:../../../Lib/vc14win32 PhysX3CommonDEBUG_x86.lib PhysX3DEBUG_x86.lib PhysX3CookingDEBUG_x86.lib PhysX3CharacterKinematicDEBUG_x86.lib PhysX3ExtensionsDEBUG.lib PhysX3VehicleDEBUG.lib PxPvdSDKDEBUG_x86.lib PxTaskDEBUG_x86.lib PxCudaContextManagerDEBUG_x86.lib PxFoundationDEBUG_x86.lib PsFastXmlDEBUG_x86.lib /DEBUG</AdditionalOptions> + <AdditionalOptions>Winmm.lib /LIBPATH:../../lib/vc14win32 /LIBPATH:../../../../PxShared/lib/vc14win32 /LIBPATH:../../../Lib/vc14win32 PhysX3CommonDEBUG_x86.lib PhysX3DEBUG_x86.lib PhysX3CookingDEBUG_x86.lib PhysX3CharacterKinematicDEBUG_x86.lib PhysX3ExtensionsDEBUG.lib PhysX3VehicleDEBUG.lib PxPvdSDKDEBUG_x86.lib PxTaskDEBUG_x86.lib PxFoundationDEBUG_x86.lib PsFastXmlDEBUG_x86.lib /DEBUG</AdditionalOptions> <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(ProjectName)DEBUG.exe</OutputFile> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> @@ -133,7 +133,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Link> - <AdditionalOptions>Winmm.lib /LIBPATH:../../lib/vc14win32 /LIBPATH:../../../../PxShared/lib/vc14win32 /LIBPATH:../../../Lib/vc14win32 PhysX3CommonCHECKED_x86.lib PhysX3CHECKED_x86.lib PhysX3CookingCHECKED_x86.lib PhysX3CharacterKinematicCHECKED_x86.lib PhysX3ExtensionsCHECKED.lib PhysX3VehicleCHECKED.lib PxPvdSDKCHECKED_x86.lib PxTaskCHECKED_x86.lib PxCudaContextManagerCHECKED_x86.lib PxFoundationCHECKED_x86.lib PsFastXmlCHECKED_x86.lib</AdditionalOptions> + <AdditionalOptions>Winmm.lib /LIBPATH:../../lib/vc14win32 /LIBPATH:../../../../PxShared/lib/vc14win32 /LIBPATH:../../../Lib/vc14win32 PhysX3CommonCHECKED_x86.lib PhysX3CHECKED_x86.lib PhysX3CookingCHECKED_x86.lib PhysX3CharacterKinematicCHECKED_x86.lib PhysX3ExtensionsCHECKED.lib PhysX3VehicleCHECKED.lib PxPvdSDKCHECKED_x86.lib PxTaskCHECKED_x86.lib PxFoundationCHECKED_x86.lib PsFastXmlCHECKED_x86.lib</AdditionalOptions> <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(ProjectName)CHECKED.exe</OutputFile> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> @@ -181,7 +181,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Link> - <AdditionalOptions>Winmm.lib /LIBPATH:../../lib/vc14win32 /LIBPATH:../../../../PxShared/lib/vc14win32 /INCREMENTAL:NO /LIBPATH:../../../Lib/vc14win32 PhysX3CommonPROFILE_x86.lib PhysX3PROFILE_x86.lib PhysX3CookingPROFILE_x86.lib PhysX3CharacterKinematicPROFILE_x86.lib PhysX3ExtensionsPROFILE.lib PhysX3VehiclePROFILE.lib PxPvdSDKPROFILE_x86.lib PxTaskPROFILE_x86.lib PxCudaContextManagerPROFILE_x86.lib PxFoundationPROFILE_x86.lib PsFastXmlPROFILE_x86.lib /DEBUG</AdditionalOptions> + <AdditionalOptions>Winmm.lib /LIBPATH:../../lib/vc14win32 /LIBPATH:../../../../PxShared/lib/vc14win32 /INCREMENTAL:NO /LIBPATH:../../../Lib/vc14win32 PhysX3CommonPROFILE_x86.lib PhysX3PROFILE_x86.lib PhysX3CookingPROFILE_x86.lib PhysX3CharacterKinematicPROFILE_x86.lib PhysX3ExtensionsPROFILE.lib PhysX3VehiclePROFILE.lib PxPvdSDKPROFILE_x86.lib PxTaskPROFILE_x86.lib PxFoundationPROFILE_x86.lib PsFastXmlPROFILE_x86.lib /DEBUG</AdditionalOptions> <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(ProjectName)PROFILE.exe</OutputFile> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> @@ -229,7 +229,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Link> - <AdditionalOptions>Winmm.lib /LIBPATH:../../lib/vc14win32 /LIBPATH:../../../../PxShared/lib/vc14win32 /INCREMENTAL:NO /LIBPATH:../../../Lib/vc14win32 PhysX3Common_x86.lib PhysX3_x86.lib PhysX3Cooking_x86.lib PhysX3CharacterKinematic_x86.lib PhysX3Extensions.lib PhysX3Vehicle.lib PxPvdSDK_x86.lib PxTask_x86.lib PxCudaContextManager_x86.lib PxFoundation_x86.lib PsFastXml_x86.lib</AdditionalOptions> + <AdditionalOptions>Winmm.lib /LIBPATH:../../lib/vc14win32 /LIBPATH:../../../../PxShared/lib/vc14win32 /INCREMENTAL:NO /LIBPATH:../../../Lib/vc14win32 PhysX3Common_x86.lib PhysX3_x86.lib PhysX3Cooking_x86.lib PhysX3CharacterKinematic_x86.lib PhysX3Extensions.lib PhysX3Vehicle.lib PxPvdSDK_x86.lib PxTask_x86.lib PxFoundation_x86.lib PsFastXml_x86.lib</AdditionalOptions> <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> diff --git a/PhysX_3.4/Samples/compiler/vc14win64/Samples.vcxproj b/PhysX_3.4/Samples/compiler/vc14win64/Samples.vcxproj index fa296b19..4312a9f7 100644 --- a/PhysX_3.4/Samples/compiler/vc14win64/Samples.vcxproj +++ b/PhysX_3.4/Samples/compiler/vc14win64/Samples.vcxproj @@ -84,7 +84,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Link> - <AdditionalOptions>Winmm.lib /LIBPATH:../../lib/vc14win64 /LIBPATH:../../../../PxShared/lib/vc14win64 /LIBPATH:../../../Lib/vc14win64 PhysX3CommonDEBUG_x64.lib PhysX3DEBUG_x64.lib PhysX3CookingDEBUG_x64.lib PhysX3CharacterKinematicDEBUG_x64.lib PhysX3ExtensionsDEBUG.lib PhysX3VehicleDEBUG.lib PxPvdSDKDEBUG_x64.lib PxTaskDEBUG_x64.lib PxCudaContextManagerDEBUG_x64.lib PxFoundationDEBUG_x64.lib PsFastXmlDEBUG_x64.lib /DEBUG</AdditionalOptions> + <AdditionalOptions>Winmm.lib /LIBPATH:../../lib/vc14win64 /LIBPATH:../../../../PxShared/lib/vc14win64 /LIBPATH:../../../Lib/vc14win64 PhysX3CommonDEBUG_x64.lib PhysX3DEBUG_x64.lib PhysX3CookingDEBUG_x64.lib PhysX3CharacterKinematicDEBUG_x64.lib PhysX3ExtensionsDEBUG.lib PhysX3VehicleDEBUG.lib PxPvdSDKDEBUG_x64.lib PxTaskDEBUG_x64.lib PxFoundationDEBUG_x64.lib PsFastXmlDEBUG_x64.lib /DEBUG</AdditionalOptions> <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(ProjectName)DEBUG.exe</OutputFile> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> @@ -131,7 +131,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Link> - <AdditionalOptions>Winmm.lib /LIBPATH:../../lib/vc14win64 /LIBPATH:../../../../PxShared/lib/vc14win64 /LIBPATH:../../../Lib/vc14win64 PhysX3CommonCHECKED_x64.lib PhysX3CHECKED_x64.lib PhysX3CookingCHECKED_x64.lib PhysX3CharacterKinematicCHECKED_x64.lib PhysX3ExtensionsCHECKED.lib PhysX3VehicleCHECKED.lib PxPvdSDKCHECKED_x64.lib PxTaskCHECKED_x64.lib PxCudaContextManagerCHECKED_x64.lib PxFoundationCHECKED_x64.lib PsFastXmlCHECKED_x64.lib</AdditionalOptions> + <AdditionalOptions>Winmm.lib /LIBPATH:../../lib/vc14win64 /LIBPATH:../../../../PxShared/lib/vc14win64 /LIBPATH:../../../Lib/vc14win64 PhysX3CommonCHECKED_x64.lib PhysX3CHECKED_x64.lib PhysX3CookingCHECKED_x64.lib PhysX3CharacterKinematicCHECKED_x64.lib PhysX3ExtensionsCHECKED.lib PhysX3VehicleCHECKED.lib PxPvdSDKCHECKED_x64.lib PxTaskCHECKED_x64.lib PxFoundationCHECKED_x64.lib PsFastXmlCHECKED_x64.lib</AdditionalOptions> <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(ProjectName)CHECKED.exe</OutputFile> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> @@ -178,7 +178,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Link> - <AdditionalOptions>Winmm.lib /LIBPATH:../../lib/vc14win64 /LIBPATH:../../../../PxShared/lib/vc14win64 /INCREMENTAL:NO /LIBPATH:../../../Lib/vc14win64 PhysX3CommonPROFILE_x64.lib PhysX3PROFILE_x64.lib PhysX3CookingPROFILE_x64.lib PhysX3CharacterKinematicPROFILE_x64.lib PhysX3ExtensionsPROFILE.lib PhysX3VehiclePROFILE.lib PxPvdSDKPROFILE_x64.lib PxTaskPROFILE_x64.lib PxCudaContextManagerPROFILE_x64.lib PxFoundationPROFILE_x64.lib PsFastXmlPROFILE_x64.lib /DEBUG</AdditionalOptions> + <AdditionalOptions>Winmm.lib /LIBPATH:../../lib/vc14win64 /LIBPATH:../../../../PxShared/lib/vc14win64 /INCREMENTAL:NO /LIBPATH:../../../Lib/vc14win64 PhysX3CommonPROFILE_x64.lib PhysX3PROFILE_x64.lib PhysX3CookingPROFILE_x64.lib PhysX3CharacterKinematicPROFILE_x64.lib PhysX3ExtensionsPROFILE.lib PhysX3VehiclePROFILE.lib PxPvdSDKPROFILE_x64.lib PxTaskPROFILE_x64.lib PxFoundationPROFILE_x64.lib PsFastXmlPROFILE_x64.lib /DEBUG</AdditionalOptions> <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(ProjectName)PROFILE.exe</OutputFile> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> @@ -225,7 +225,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Link> - <AdditionalOptions>Winmm.lib /LIBPATH:../../lib/vc14win64 /LIBPATH:../../../../PxShared/lib/vc14win64 /INCREMENTAL:NO /LIBPATH:../../../Lib/vc14win64 PhysX3Common_x64.lib PhysX3_x64.lib PhysX3Cooking_x64.lib PhysX3CharacterKinematic_x64.lib PhysX3Extensions.lib PhysX3Vehicle.lib PxPvdSDK_x64.lib PxTask_x64.lib PxCudaContextManager_x64.lib PxFoundation_x64.lib PsFastXml_x64.lib</AdditionalOptions> + <AdditionalOptions>Winmm.lib /LIBPATH:../../lib/vc14win64 /LIBPATH:../../../../PxShared/lib/vc14win64 /INCREMENTAL:NO /LIBPATH:../../../Lib/vc14win64 PhysX3Common_x64.lib PhysX3_x64.lib PhysX3Cooking_x64.lib PhysX3CharacterKinematic_x64.lib PhysX3Extensions.lib PhysX3Vehicle.lib PxPvdSDK_x64.lib PxTask_x64.lib PxFoundation_x64.lib PsFastXml_x64.lib</AdditionalOptions> <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |