diff options
Diffstat (limited to 'APEX_1.4/module')
4 files changed, 8 insertions, 8 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 diff --git a/APEX_1.4/module/destructible/src/ModuleDestructibleImpl.cpp b/APEX_1.4/module/destructible/src/ModuleDestructibleImpl.cpp index e99348c5..348d6fac 100644 --- a/APEX_1.4/module/destructible/src/ModuleDestructibleImpl.cpp +++ b/APEX_1.4/module/destructible/src/ModuleDestructibleImpl.cpp @@ -35,7 +35,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; diff --git a/APEX_1.4/module/legacy/src/ModuleLegacy.cpp b/APEX_1.4/module/legacy/src/ModuleLegacy.cpp index bff406e5..cc95f6a3 100644 --- a/APEX_1.4/module/legacy/src/ModuleLegacy.cpp +++ b/APEX_1.4/module/legacy/src/ModuleLegacy.cpp @@ -21,7 +21,7 @@ namespace nvidia namespace apex { -#if defined(_USRDLL) || PX_OSX +#if defined(_USRDLL) || PX_OSX || (PX_LINUX && APEX_LINUX_SHARED_LIBRARIES) ApexSDKIntl* gApexSdk = 0; ApexSDK* GetApexSDK() { @@ -122,7 +122,7 @@ private: }; } -#if defined(_USRDLL) || PX_OSX +#if defined(_USRDLL) || PX_OSX || (PX_LINUX && APEX_LINUX_SHARED_LIBRARIES) APEX_API Module* CALL_CONV createModule( ApexSDKIntl* inSdk, diff --git a/APEX_1.4/module/loader/src/ModuleLoaderImpl.cpp b/APEX_1.4/module/loader/src/ModuleLoaderImpl.cpp index 4cf76a02..d90471ef 100644 --- a/APEX_1.4/module/loader/src/ModuleLoaderImpl.cpp +++ b/APEX_1.4/module/loader/src/ModuleLoaderImpl.cpp @@ -24,13 +24,13 @@ namespace nvidia namespace apex { -#if !defined(_USRDLL) && !PX_OSX +#if !defined(_USRDLL) && !PX_OSX && (!PX_LINUX || !APEX_LINUX_SHARED_LIBRARIES) # define INSTANTIATE_MODULE(instFunc) do { instFunc(); } while(0) #else # define INSTANTIATE_MODULE(instFunc) #endif -#if defined(_USRDLL) || PX_OSX +#if defined(_USRDLL) || PX_OSX || (PX_LINUX && APEX_LINUX_SHARED_LIBRARIES) ApexSDKIntl* gApexSdk = 0; ApexSDK* GetApexSDK() |