TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-14 16:14:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #981 from BeamNG/fix_opengl_x64

Browse source 
Fix x64 builds.
This commit is contained in:
LuisAntonRebollo 2014-11-30 04:02:24 +01:00
commit 8b25a5e90e
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/gfx/gl/tGL/tWGL.h
View file

@ -25,14 +25,14 @@
#include "platform/platform.h" #include "platform/platform.h"
#ifdef TORQUE_OS_WIN32 #ifdef TORQUE_OPENGL
#include "tGL.h" #include "tGL.h"
#include "GL/wglew.h" #include "GL/wglew.h"
#define gglHasWExtension(EXTENSION) WGLEW_##EXTENSION #define gglHasWExtension(EXTENSION) WGLEW_##EXTENSION
#endif //TORQUE_OS_WIN32 #endif //TORQUE_OPENGL
#endif #endif

4
Engine/source/lighting/advanced/advancedLightingFeatures.cpp
View file

@ -31,7 +31,7 @@
#include "gfx/gfxDevice.h" #include "gfx/gfxDevice.h"
#include "core/util/safeDelete.h" #include "core/util/safeDelete.h"
#if defined( TORQUE_OS_WIN32 ) || defined( TORQUE_OS_XBOX ) #if defined( TORQUE_OS_WIN ) || defined( TORQUE_OS_XBOX )
# include "lighting/advanced/hlsl/gBufferConditionerHLSL.h" # include "lighting/advanced/hlsl/gBufferConditionerHLSL.h"
# include "lighting/advanced/hlsl/advancedLightingFeaturesHLSL.h" # include "lighting/advanced/hlsl/advancedLightingFeaturesHLSL.h"
#endif #endif
@ -67,7 +67,7 @@ void AdvancedLightingFeatures::registerFeatures( const GFXFormat &prepassTargetF
} }
else else
{ {
#if defined( TORQUE_OS_WIN32 ) #if defined( TORQUE_OS_WIN )
cond = new GBufferConditionerHLSL( prepassTargetFormat, GBufferConditionerHLSL::ViewSpace ); cond = new GBufferConditionerHLSL( prepassTargetFormat, GBufferConditionerHLSL::ViewSpace );
FEATUREMGR->registerFeature(MFT_PrePassConditioner, cond); FEATUREMGR->registerFeature(MFT_PrePassConditioner, cond);
FEATUREMGR->registerFeature(MFT_RTLighting, new DeferredRTLightingFeatHLSL()); FEATUREMGR->registerFeature(MFT_RTLighting, new DeferredRTLightingFeatHLSL());

2
Engine/source/lighting/basic/basicLightManager.cpp
View file

@ -172,7 +172,7 @@ void BasicLightManager::activate( SceneManager *sceneManager )
} }
else else
{ {
#if defined( TORQUE_OS_WIN32 ) #if defined( TORQUE_OS_WIN )
FEATUREMGR->registerFeature( MFT_LightMap, new LightmapFeatHLSL ); FEATUREMGR->registerFeature( MFT_LightMap, new LightmapFeatHLSL );
FEATUREMGR->registerFeature( MFT_ToneMap, new TonemapFeatHLSL ); FEATUREMGR->registerFeature( MFT_ToneMap, new TonemapFeatHLSL );
FEATUREMGR->registerFeature( MFT_NormalMap, new BumpFeatHLSL ); FEATUREMGR->registerFeature( MFT_NormalMap, new BumpFeatHLSL );