aboutsummaryrefslogtreecommitdiff
path: root/APEX_1.4/module/clothing/src/ModuleClothingImpl.cpp
diff options
context:
space:
mode:
authorSheikh Dawood Abdul Ajees <[email protected]>2018-01-26 19:43:03 -0600
committerSheikh Dawood Abdul Ajees <[email protected]>2018-01-26 19:43:03 -0600
commitb6db9a56548cd1c41bee309e721d76ea2c9320da (patch)
tree1f0436b187db50c21e576b4f4d491530113c91bc /APEX_1.4/module/clothing/src/ModuleClothingImpl.cpp
parentPhysX 3.4.1, APEX 1.4.1 Release @23307153 (diff)
downloadphysx-3.4-b6db9a56548cd1c41bee309e721d76ea2c9320da.tar.xz
physx-3.4-b6db9a56548cd1c41bee309e721d76ea2c9320da.zip
PhysX 3.4, APEX 1.4 patch release @23472123
Diffstat (limited to 'APEX_1.4/module/clothing/src/ModuleClothingImpl.cpp')
-rw-r--r--APEX_1.4/module/clothing/src/ModuleClothingImpl.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/APEX_1.4/module/clothing/src/ModuleClothingImpl.cpp b/APEX_1.4/module/clothing/src/ModuleClothingImpl.cpp
index fbc41096..9c933d4d 100644
--- a/APEX_1.4/module/clothing/src/ModuleClothingImpl.cpp
+++ b/APEX_1.4/module/clothing/src/ModuleClothingImpl.cpp
@@ -62,7 +62,7 @@ namespace nvidia
namespace apex
{
-#if defined(_USRDLL) || PX_OSX
+#if defined(_USRDLL) || PX_OSX || (PX_LINUX && APEX_LINUX_SHARED_LIBRARIES)
/* Modules don't have to link against the framework, they keep their own */
ApexSDKIntl* gApexSdk = 0;
@@ -106,7 +106,7 @@ APEX_API Module* CALL_CONV createModule(
return (Module*) impl;
}
-#else // !defined(_USRDLL) && !PX_OSX
+#else // !defined(_USRDLL) && !PX_OSX && (!PX_LINUX || !APEX_LINUX_SHARED_LIBRARIES)
/* Statically linking entry function */
void instantiateModuleClothing()
@@ -116,7 +116,7 @@ void instantiateModuleClothing()
clothing::ModuleClothingImpl* impl = PX_NEW(clothing::ModuleClothingImpl)(sdk);
sdk->registerExternalModule((Module*) impl, (ModuleIntl*) impl);
}
-#endif // !defined(_USRDLL) && !PX_OSX
+#endif // !defined(_USRDLL) && !PX_OSX && (!PX_LINUX || !APEX_LINUX_SHARED_LIBRARIES)
}
namespace clothing