Skip to content

D
deprecated-irrlicht-mac
Commit cc6f569b authored by nadro's avatar nadro
Browse files
Options

- Fixed issue with 2D line rendering in OpenGL. 

- Fixed issue with example no. 3 (other driver also need similar improvements -> move texture parameters update from OnSetMaterial/setBasicRenderStates to OnRender, because SMaterial compare operator doesn't check SMaterialLayer values).

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4416 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 45c26940
Hide whitespace changes
Inline Side-by-side
Showing with 297 additions and 269 deletions
source/Irrlicht/COpenGLCgMaterialRenderer.cpp
View file @ cc6f569b
...@@ -104,6 +104,8 @@ void COpenGLCgMaterialRenderer::OnSetMaterial(const SMaterial& material, const S ...@@ -104,6 +104,8 @@ void COpenGLCgMaterialRenderer::OnSetMaterial(const SMaterial& material, const S
bool COpenGLCgMaterialRenderer::OnRender(IMaterialRendererServices* services, E_VERTEX_TYPE vtxtype) bool COpenGLCgMaterialRenderer::OnRender(IMaterialRendererServices* services, E_VERTEX_TYPE vtxtype)
{ {
Driver->setTextureRenderStates(Driver->getCurrentMaterial(), false, false);
if (CallBack && (VertexProgram || FragmentProgram || GeometryProgram)) if (CallBack && (VertexProgram || FragmentProgram || GeometryProgram))
CallBack->OnSetConstants(this, UserData); CallBack->OnSetConstants(this, UserData);
......
source/Irrlicht/COpenGLDriver.cpp
View file @ cc6f569b
...@@ -755,7 +755,7 @@ bool COpenGLDriver::genericDriverInit() ...@@ -755,7 +755,7 @@ bool COpenGLDriver::genericDriverInit()
extGlProvokingVertex(GL_FIRST_VERTEX_CONVENTION_EXT); extGlProvokingVertex(GL_FIRST_VERTEX_CONVENTION_EXT);
#endif #endif
// Create built-in 2D quad for 2D rendering. // Create built-in 2D quad and line for 2D rendering.
Quad2DIndices[0] = 0; Quad2DIndices[0] = 0;
Quad2DIndices[1] = 2; Quad2DIndices[1] = 2;
...@@ -763,6 +763,9 @@ bool COpenGLDriver::genericDriverInit() ...@@ -763,6 +763,9 @@ bool COpenGLDriver::genericDriverInit()
Quad2DIndices[3] = 0; Quad2DIndices[3] = 0;
Quad2DIndices[4] = 1; Quad2DIndices[4] = 1;
Quad2DIndices[5] = 2; Quad2DIndices[5] = 2;
Line2DIndices[0] = 0;
Line2DIndices[1] = 1;
Quad2DVertices[0] = S3DVertex(core::vector3df(-1.0f, 1.0f, 0.0f), core::vector3df(0.0f, 0.0f, 0.0f), SColor(255,255,255,255), core::vector2df(0.0f, 1.0f)); Quad2DVertices[0] = S3DVertex(core::vector3df(-1.0f, 1.0f, 0.0f), core::vector3df(0.0f, 0.0f, 0.0f), SColor(255,255,255,255), core::vector2df(0.0f, 1.0f));
Quad2DVertices[0] = S3DVertex(core::vector3df(1.0f, 1.0f, 0.0f), core::vector3df(0.0f, 0.0f, 0.0f), SColor(255,255,255,255), core::vector2df(1.0f, 1.0f)); Quad2DVertices[0] = S3DVertex(core::vector3df(1.0f, 1.0f, 0.0f), core::vector3df(0.0f, 0.0f, 0.0f), SColor(255,255,255,255), core::vector2df(1.0f, 1.0f));
...@@ -2521,7 +2524,7 @@ void COpenGLDriver::draw2DLine(const core::position2d<s32>& start, ...@@ -2521,7 +2524,7 @@ void COpenGLDriver::draw2DLine(const core::position2d<s32>& start,
glColorPointer(colorSize, GL_UNSIGNED_BYTE, 0, &ColorBuffer[0]); glColorPointer(colorSize, GL_UNSIGNED_BYTE, 0, &ColorBuffer[0]);
} }
glDrawElements(GL_LINES, 2, GL_UNSIGNED_SHORT, Quad2DIndices); glDrawElements(GL_LINES, 2, GL_UNSIGNED_SHORT, Line2DIndices);
} }
} }
...@@ -2978,147 +2981,6 @@ void COpenGLDriver::setBasicRenderStates(const SMaterial& material, const SMater ...@@ -2978,147 +2981,6 @@ void COpenGLDriver::setBasicRenderStates(const SMaterial& material, const SMater
} }
} }
// Set textures to TU/TIU and apply filters to them
for (s32 i = MaxTextureUnits-1; i>= 0; --i)
{
const COpenGLTexture* tmpTexture = static_cast<const COpenGLTexture*>(CurrentTexture[i]);
if(fixedPipeline)
{
if (i>0 && !MultiTextureExtension)
break;
if (!CurrentTexture[i])
{
BridgeCalls->setTexture(i, fixedPipeline);
continue;
}
else
{
BridgeCalls->setTexture(i, fixedPipeline);
setTransform ((E_TRANSFORMATION_STATE) (ETS_TEXTURE_0 + i), material.getTextureMatrix(i));
}
}
else
{
if (CurrentTexture[i])
{
BridgeCalls->setTexture(i, fixedPipeline);
}
else
continue;
}
if(resetAllRenderStates)
tmpTexture->getStatesCache().IsCached = false;
#ifdef GL_VERSION_2_1
if (Version>=210)
{
if(!tmpTexture->getStatesCache().IsCached || material.TextureLayer[i].LODBias != tmpTexture->getStatesCache().LODBias)
{
if (material.TextureLayer[i].LODBias)
{
const float tmp = core::clamp(material.TextureLayer[i].LODBias * 0.125f, -MaxTextureLODBias, MaxTextureLODBias);
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_LOD_BIAS, tmp);
}
else
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_LOD_BIAS, 0.f);
tmpTexture->getStatesCache().LODBias = material.TextureLayer[i].LODBias;
}
}
else if (FeatureAvailable[IRR_EXT_texture_lod_bias])
{
if (material.TextureLayer[i].LODBias)
{
const float tmp = core::clamp(material.TextureLayer[i].LODBias * 0.125f, -MaxTextureLODBias, MaxTextureLODBias);
glTexEnvf(GL_TEXTURE_FILTER_CONTROL_EXT, GL_TEXTURE_LOD_BIAS_EXT, tmp);
}
else
glTexEnvf(GL_TEXTURE_FILTER_CONTROL_EXT, GL_TEXTURE_LOD_BIAS_EXT, 0.f);
}
#elif defined(GL_EXT_texture_lod_bias)
if (FeatureAvailable[IRR_EXT_texture_lod_bias])
{
if (material.TextureLayer[i].LODBias)
{
const float tmp = core::clamp(material.TextureLayer[i].LODBias * 0.125f, -MaxTextureLODBias, MaxTextureLODBias);
glTexEnvf(GL_TEXTURE_FILTER_CONTROL_EXT, GL_TEXTURE_LOD_BIAS_EXT, tmp);
}
else
glTexEnvf(GL_TEXTURE_FILTER_CONTROL_EXT, GL_TEXTURE_LOD_BIAS_EXT, 0.f);
}
#endif
if(!tmpTexture->getStatesCache().IsCached || material.TextureLayer[i].BilinearFilter != tmpTexture->getStatesCache().BilinearFilter ||
material.TextureLayer[i].TrilinearFilter != tmpTexture->getStatesCache().TrilinearFilter)
{
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER,
(material.TextureLayer[i].BilinearFilter || material.TextureLayer[i].TrilinearFilter) ? GL_LINEAR : GL_NEAREST);
tmpTexture->getStatesCache().BilinearFilter = material.TextureLayer[i].BilinearFilter;
tmpTexture->getStatesCache().TrilinearFilter = material.TextureLayer[i].TrilinearFilter;
}
if (material.UseMipMaps && CurrentTexture[i]->hasMipMaps())
{
if(!tmpTexture->getStatesCache().IsCached || material.TextureLayer[i].BilinearFilter != tmpTexture->getStatesCache().BilinearFilter ||
material.TextureLayer[i].TrilinearFilter != tmpTexture->getStatesCache().TrilinearFilter || !tmpTexture->getStatesCache().MipMapStatus)
{
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
material.TextureLayer[i].TrilinearFilter ? GL_LINEAR_MIPMAP_LINEAR :
material.TextureLayer[i].BilinearFilter ? GL_LINEAR_MIPMAP_NEAREST :
GL_NEAREST_MIPMAP_NEAREST);
tmpTexture->getStatesCache().BilinearFilter = material.TextureLayer[i].BilinearFilter;
tmpTexture->getStatesCache().TrilinearFilter = material.TextureLayer[i].TrilinearFilter;
tmpTexture->getStatesCache().MipMapStatus = true;
}
}
else
{
if(!tmpTexture->getStatesCache().IsCached || material.TextureLayer[i].BilinearFilter != tmpTexture->getStatesCache().BilinearFilter ||
material.TextureLayer[i].TrilinearFilter != tmpTexture->getStatesCache().TrilinearFilter || tmpTexture->getStatesCache().MipMapStatus)
{
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
(material.TextureLayer[i].BilinearFilter || material.TextureLayer[i].TrilinearFilter) ? GL_LINEAR : GL_NEAREST);
tmpTexture->getStatesCache().BilinearFilter = material.TextureLayer[i].BilinearFilter;
tmpTexture->getStatesCache().TrilinearFilter = material.TextureLayer[i].TrilinearFilter;
tmpTexture->getStatesCache().MipMapStatus = false;
}
}
#ifdef GL_EXT_texture_filter_anisotropic
if (FeatureAvailable[IRR_EXT_texture_filter_anisotropic] &&
(!tmpTexture->getStatesCache().IsCached || material.TextureLayer[i].AnisotropicFilter != tmpTexture->getStatesCache().AnisotropicFilter))
{
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT,
material.TextureLayer[i].AnisotropicFilter>1 ? core::min_(MaxAnisotropy, material.TextureLayer[i].AnisotropicFilter) : 1);
tmpTexture->getStatesCache().AnisotropicFilter = material.TextureLayer[i].AnisotropicFilter;
}
#endif
if(!tmpTexture->getStatesCache().IsCached || material.TextureLayer[i].TextureWrapU != tmpTexture->getStatesCache().WrapU)
{
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, getTextureWrapMode(material.TextureLayer[i].TextureWrapU));
tmpTexture->getStatesCache().WrapU = material.TextureLayer[i].TextureWrapU;
}
if(!tmpTexture->getStatesCache().IsCached || material.TextureLayer[i].TextureWrapV != tmpTexture->getStatesCache().WrapV)
{
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, getTextureWrapMode(material.TextureLayer[i].TextureWrapV));
tmpTexture->getStatesCache().WrapV = material.TextureLayer[i].TextureWrapV;
}
tmpTexture->getStatesCache().IsCached = true;
}
// fillmode // fillmode
if (resetAllRenderStates || (lastmaterial.Wireframe != material.Wireframe) || (lastmaterial.PointCloud != material.PointCloud)) if (resetAllRenderStates || (lastmaterial.Wireframe != material.Wireframe) || (lastmaterial.PointCloud != material.PointCloud))
glPolygonMode(GL_FRONT_AND_BACK, material.Wireframe ? GL_LINE : material.PointCloud? GL_POINT : GL_FILL); glPolygonMode(GL_FRONT_AND_BACK, material.Wireframe ? GL_LINE : material.PointCloud? GL_POINT : GL_FILL);
...@@ -3383,8 +3245,152 @@ void COpenGLDriver::setBasicRenderStates(const SMaterial& material, const SMater ...@@ -3383,8 +3245,152 @@ void COpenGLDriver::setBasicRenderStates(const SMaterial& material, const SMater
} }
// be sure to leave in texture stage 0 // be sure to leave in texture stage 0
if (fixedPipeline) BridgeCalls->setActiveTexture(GL_TEXTURE0_ARB);
BridgeCalls->setActiveTexture(GL_TEXTURE0_ARB); }
//! Compare in SMaterial doesn't check texture parameters, so we should call this on each OnRender call.
void COpenGLDriver::setTextureRenderStates(const SMaterial& material, bool resetAllRenderstates, bool fixedPipeline)
{
// Set textures to TU/TIU and apply filters to them
for (s32 i = MaxTextureUnits-1; i>= 0; --i)
{
const COpenGLTexture* tmpTexture = static_cast<const COpenGLTexture*>(CurrentTexture[i]);
if(fixedPipeline)
{
if (i>0 && !MultiTextureExtension)
break;
if (!CurrentTexture[i])
{
BridgeCalls->setTexture(i, fixedPipeline);
continue;
}
else
{
BridgeCalls->setTexture(i, fixedPipeline);
setTransform ((E_TRANSFORMATION_STATE) (ETS_TEXTURE_0 + i), material.getTextureMatrix(i));
}
}
else
{
if (CurrentTexture[i])
{
BridgeCalls->setTexture(i, fixedPipeline);
}
else
continue;
}
if(resetAllRenderstates)
tmpTexture->getStatesCache().IsCached = false;
#ifdef GL_VERSION_2_1
if (Version>=210)
{
if(!tmpTexture->getStatesCache().IsCached || material.TextureLayer[i].LODBias != tmpTexture->getStatesCache().LODBias)
{
if (material.TextureLayer[i].LODBias)
{
const float tmp = core::clamp(material.TextureLayer[i].LODBias * 0.125f, -MaxTextureLODBias, MaxTextureLODBias);
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_LOD_BIAS, tmp);
}
else
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_LOD_BIAS, 0.f);
tmpTexture->getStatesCache().LODBias = material.TextureLayer[i].LODBias;
}
}
else if (FeatureAvailable[IRR_EXT_texture_lod_bias])
{
if (material.TextureLayer[i].LODBias)
{
const float tmp = core::clamp(material.TextureLayer[i].LODBias * 0.125f, -MaxTextureLODBias, MaxTextureLODBias);
glTexEnvf(GL_TEXTURE_FILTER_CONTROL_EXT, GL_TEXTURE_LOD_BIAS_EXT, tmp);
}
else
glTexEnvf(GL_TEXTURE_FILTER_CONTROL_EXT, GL_TEXTURE_LOD_BIAS_EXT, 0.f);
}
#elif defined(GL_EXT_texture_lod_bias)
if (FeatureAvailable[IRR_EXT_texture_lod_bias])
{
if (material.TextureLayer[i].LODBias)
{
const float tmp = core::clamp(material.TextureLayer[i].LODBias * 0.125f, -MaxTextureLODBias, MaxTextureLODBias);
glTexEnvf(GL_TEXTURE_FILTER_CONTROL_EXT, GL_TEXTURE_LOD_BIAS_EXT, tmp);
}
else
glTexEnvf(GL_TEXTURE_FILTER_CONTROL_EXT, GL_TEXTURE_LOD_BIAS_EXT, 0.f);
}
#endif
if(!tmpTexture->getStatesCache().IsCached || material.TextureLayer[i].BilinearFilter != tmpTexture->getStatesCache().BilinearFilter ||
material.TextureLayer[i].TrilinearFilter != tmpTexture->getStatesCache().TrilinearFilter)
{
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER,
(material.TextureLayer[i].BilinearFilter || material.TextureLayer[i].TrilinearFilter) ? GL_LINEAR : GL_NEAREST);
tmpTexture->getStatesCache().BilinearFilter = material.TextureLayer[i].BilinearFilter;
tmpTexture->getStatesCache().TrilinearFilter = material.TextureLayer[i].TrilinearFilter;
}
if (material.UseMipMaps && CurrentTexture[i]->hasMipMaps())
{
if(!tmpTexture->getStatesCache().IsCached || material.TextureLayer[i].BilinearFilter != tmpTexture->getStatesCache().BilinearFilter ||
material.TextureLayer[i].TrilinearFilter != tmpTexture->getStatesCache().TrilinearFilter || !tmpTexture->getStatesCache().MipMapStatus)
{
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
material.TextureLayer[i].TrilinearFilter ? GL_LINEAR_MIPMAP_LINEAR :
material.TextureLayer[i].BilinearFilter ? GL_LINEAR_MIPMAP_NEAREST :
GL_NEAREST_MIPMAP_NEAREST);
tmpTexture->getStatesCache().BilinearFilter = material.TextureLayer[i].BilinearFilter;
tmpTexture->getStatesCache().TrilinearFilter = material.TextureLayer[i].TrilinearFilter;
tmpTexture->getStatesCache().MipMapStatus = true;
}
}
else
{
if(!tmpTexture->getStatesCache().IsCached || material.TextureLayer[i].BilinearFilter != tmpTexture->getStatesCache().BilinearFilter ||
material.TextureLayer[i].TrilinearFilter != tmpTexture->getStatesCache().TrilinearFilter || tmpTexture->getStatesCache().MipMapStatus)
{
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
(material.TextureLayer[i].BilinearFilter || material.TextureLayer[i].TrilinearFilter) ? GL_LINEAR : GL_NEAREST);
tmpTexture->getStatesCache().BilinearFilter = material.TextureLayer[i].BilinearFilter;
tmpTexture->getStatesCache().TrilinearFilter = material.TextureLayer[i].TrilinearFilter;
tmpTexture->getStatesCache().MipMapStatus = false;
}
}
#ifdef GL_EXT_texture_filter_anisotropic
if (FeatureAvailable[IRR_EXT_texture_filter_anisotropic] &&
(!tmpTexture->getStatesCache().IsCached || material.TextureLayer[i].AnisotropicFilter != tmpTexture->getStatesCache().AnisotropicFilter))
{
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT,
material.TextureLayer[i].AnisotropicFilter>1 ? core::min_(MaxAnisotropy, material.TextureLayer[i].AnisotropicFilter) : 1);
tmpTexture->getStatesCache().AnisotropicFilter = material.TextureLayer[i].AnisotropicFilter;
}
#endif
if(!tmpTexture->getStatesCache().IsCached || material.TextureLayer[i].TextureWrapU != tmpTexture->getStatesCache().WrapU)
{
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, getTextureWrapMode(material.TextureLayer[i].TextureWrapU));
tmpTexture->getStatesCache().WrapU = material.TextureLayer[i].TextureWrapU;
}
if(!tmpTexture->getStatesCache().IsCached || material.TextureLayer[i].TextureWrapV != tmpTexture->getStatesCache().WrapV)
{
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, getTextureWrapMode(material.TextureLayer[i].TextureWrapV));
tmpTexture->getStatesCache().WrapV = material.TextureLayer[i].TextureWrapV;
}
tmpTexture->getStatesCache().IsCached = true;
}
} }
...@@ -3472,12 +3478,34 @@ void COpenGLDriver::setRenderStates2DMode(bool alpha, bool texture, bool alphaCh ...@@ -3472,12 +3478,34 @@ void COpenGLDriver::setRenderStates2DMode(bool alpha, bool texture, bool alphaCh
if(!BindedTexture && CurrentTexture[0]) if(!BindedTexture && CurrentTexture[0])
BridgeCalls->setTexture(0, true); BridgeCalls->setTexture(0, true);
if (!OverrideMaterial2DEnabled) if (!OverrideMaterial2DEnabled && CurrentTexture[0])
{ {
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); const COpenGLTexture* tmpTexture = static_cast<const COpenGLTexture*>(CurrentTexture[0]);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); if (tmpTexture->getStatesCache().IsCached && !tmpTexture->getStatesCache().BilinearFilter &&
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); !tmpTexture->getStatesCache().TrilinearFilter && !tmpTexture->getStatesCache().MipMapStatus)
{
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
tmpTexture->getStatesCache().BilinearFilter = false;
tmpTexture->getStatesCache().TrilinearFilter = false;
tmpTexture->getStatesCache().MipMapStatus = false;
}
if(!tmpTexture->getStatesCache().IsCached || ETC_REPEAT != tmpTexture->getStatesCache().WrapU)
{
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
tmpTexture->getStatesCache().WrapU = ETC_REPEAT;
}
if(!tmpTexture->getStatesCache().IsCached || GL_REPEAT != tmpTexture->getStatesCache().WrapV)
{
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
tmpTexture->getStatesCache().WrapV = ETC_REPEAT;
}
tmpTexture->getStatesCache().IsCached = true;
} }
Material.setTexture(0, const_cast<video::ITexture*>(CurrentTexture[0])); Material.setTexture(0, const_cast<video::ITexture*>(CurrentTexture[0]));
setTransform(ETS_TEXTURE_0, core::IdentityMatrix); setTransform(ETS_TEXTURE_0, core::IdentityMatrix);
...@@ -4058,7 +4086,7 @@ void COpenGLDriver::draw3DLine(const core::vector3df& start, ...@@ -4058,7 +4086,7 @@ void COpenGLDriver::draw3DLine(const core::vector3df& start,
glColorPointer(colorSize, GL_UNSIGNED_BYTE, 0, &ColorBuffer[0]); glColorPointer(colorSize, GL_UNSIGNED_BYTE, 0, &ColorBuffer[0]);
} }
glDrawElements(GL_LINES, 2, GL_UNSIGNED_SHORT, Quad2DIndices); glDrawElements(GL_LINES, 2, GL_UNSIGNED_SHORT, Line2DIndices);
} }
...@@ -4972,6 +5000,11 @@ GLenum COpenGLDriver::getZBufferBits() const ...@@ -4972,6 +5000,11 @@ GLenum COpenGLDriver::getZBufferBits() const
} }
return bits; return bits;
} }
const SMaterial& COpenGLDriver::getCurrentMaterial() const
{
return Material;
}
COpenGLCallBridge* COpenGLDriver::getBridgeCalls() const COpenGLCallBridge* COpenGLDriver::getBridgeCalls() const
{ {
...@@ -5005,6 +5038,8 @@ COpenGLCallBridge::COpenGLCallBridge(COpenGLDriver* driver) : Driver(driver), ...@@ -5005,6 +5038,8 @@ COpenGLCallBridge::COpenGLCallBridge(COpenGLDriver* driver) : Driver(driver),
Driver->extGlActiveTexture(GL_TEXTURE0_ARB); Driver->extGlActiveTexture(GL_TEXTURE0_ARB);
Driver->extGlClientActiveTexture(GL_TEXTURE0_ARB); Driver->extGlClientActiveTexture(GL_TEXTURE0_ARB);
} }
glDisable(GL_TEXTURE_2D);
glDisableClientState(GL_VERTEX_ARRAY); glDisableClientState(GL_VERTEX_ARRAY);
glDisableClientState(GL_NORMAL_ARRAY); glDisableClientState(GL_NORMAL_ARRAY);
......
source/Irrlicht/COpenGLDriver.h
View file @ cc6f569b
...@@ -280,11 +280,15 @@ namespace video ...@@ -280,11 +280,15 @@ namespace video
bool resetAllRenderstates) bool resetAllRenderstates)
{ {
setBasicRenderStates(material, lastmaterial, resetAllRenderstates, true); setBasicRenderStates(material, lastmaterial, resetAllRenderstates, true);
setTextureRenderStates(material, resetAllRenderstates, true);
} }
//! Can be called by an IMaterialRenderer to make its work easier. //! Can be called by an IMaterialRenderer to make its work easier.
virtual void setBasicRenderStates(const SMaterial& material, const SMaterial& lastmaterial, virtual void setBasicRenderStates(const SMaterial& material, const SMaterial& lastmaterial,
bool resetAllRenderstates, bool fixedPipeline); bool resetAllRenderstates, bool fixedPipeline);
//! Compare in SMaterial doesn't check texture parameters, so we should call this on each OnRender call.
virtual void setTextureRenderStates(const SMaterial& material, bool resetAllRenderstates, bool fixedPipeline);
//! Get a vertex shader constant index. //! Get a vertex shader constant index.
virtual s32 getVertexShaderConstantID(const c8* name); virtual s32 getVertexShaderConstantID(const c8* name);
...@@ -414,6 +418,9 @@ namespace video ...@@ -414,6 +418,9 @@ namespace video
//! Get ZBuffer bits. //! Get ZBuffer bits.
GLenum getZBufferBits() const; GLenum getZBufferBits() const;
//! Get current material.
const SMaterial& getCurrentMaterial() const;
//! Get bridge calls. //! Get bridge calls.
COpenGLCallBridge* getBridgeCalls() const; COpenGLCallBridge* getBridgeCalls() const;
...@@ -595,6 +602,7 @@ namespace video ...@@ -595,6 +602,7 @@ namespace video
//! Built-in 2D quad for 2D rendering. //! Built-in 2D quad for 2D rendering.
S3DVertex Quad2DVertices[4]; S3DVertex Quad2DVertices[4];
u16 Quad2DIndices[6]; u16 Quad2DIndices[6];
u16 Line2DIndices[2];
#ifdef _IRR_WINDOWS_API_ #ifdef _IRR_WINDOWS_API_
HDC HDc; // Private GDI Device Context HDC HDc; // Private GDI Device Context
......
source/Irrlicht/COpenGLMaterialRenderer.h
View file @ cc6f569b
...@@ -35,6 +35,13 @@ public: ...@@ -35,6 +35,13 @@ public:
virtual void OnUnsetBaseMaterial() virtual void OnUnsetBaseMaterial()
{ {
} }
virtual bool OnRender(IMaterialRendererServices* service, E_VERTEX_TYPE vtxtype)
{
Driver->setTextureRenderStates(Driver->getCurrentMaterial(), false, true);
return true;
}
protected: protected:
...@@ -54,7 +61,7 @@ public: ...@@ -54,7 +61,7 @@ public:
bool resetAllRenderstates, IMaterialRendererServices* services) bool resetAllRenderstates, IMaterialRendererServices* services)
{ {
Driver->disableTextures(1); Driver->disableTextures(1);
Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates); Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates, true);
if (resetAllRenderstates || (material.MaterialType != lastMaterial.MaterialType)) if (resetAllRenderstates || (material.MaterialType != lastMaterial.MaterialType))
{ {
...@@ -78,7 +85,7 @@ public: ...@@ -78,7 +85,7 @@ public:
bool resetAllRenderstates, IMaterialRendererServices* services) bool resetAllRenderstates, IMaterialRendererServices* services)
{ {
Driver->disableTextures(1); Driver->disableTextures(1);
Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates); Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates, true);
// if (material.MaterialType != lastMaterial.MaterialType || // if (material.MaterialType != lastMaterial.MaterialType ||
// material.MaterialTypeParam != lastMaterial.MaterialTypeParam || // material.MaterialTypeParam != lastMaterial.MaterialTypeParam ||
...@@ -263,7 +270,7 @@ public: ...@@ -263,7 +270,7 @@ public:
bool resetAllRenderstates, IMaterialRendererServices* services) bool resetAllRenderstates, IMaterialRendererServices* services)
{ {
Driver->disableTextures(2); Driver->disableTextures(2);
Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates); Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates, true);
if (material.MaterialType != lastMaterial.MaterialType || resetAllRenderstates) if (material.MaterialType != lastMaterial.MaterialType || resetAllRenderstates)
{ {
...@@ -322,7 +329,7 @@ public: ...@@ -322,7 +329,7 @@ public:
bool resetAllRenderstates, IMaterialRendererServices* services) bool resetAllRenderstates, IMaterialRendererServices* services)
{ {
Driver->disableTextures(1); Driver->disableTextures(1);
Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates); Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates, true);
if ((material.MaterialType != lastMaterial.MaterialType) || resetAllRenderstates) if ((material.MaterialType != lastMaterial.MaterialType) || resetAllRenderstates)
{ {
...@@ -368,7 +375,7 @@ public: ...@@ -368,7 +375,7 @@ public:
bool resetAllRenderstates, IMaterialRendererServices* services) bool resetAllRenderstates, IMaterialRendererServices* services)
{ {
Driver->disableTextures(1); Driver->disableTextures(1);
Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates); Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates, true);
if (material.MaterialType != lastMaterial.MaterialType || resetAllRenderstates) if (material.MaterialType != lastMaterial.MaterialType || resetAllRenderstates)
{ {
...@@ -553,7 +560,7 @@ public: ...@@ -553,7 +560,7 @@ public:
bool resetAllRenderstates, IMaterialRendererServices* services) bool resetAllRenderstates, IMaterialRendererServices* services)
{ {
Driver->disableTextures(1); Driver->disableTextures(1);
Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates); Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates, true);
if (material.MaterialType != lastMaterial.MaterialType || resetAllRenderstates) if (material.MaterialType != lastMaterial.MaterialType || resetAllRenderstates)
{ {
...@@ -599,7 +606,7 @@ public: ...@@ -599,7 +606,7 @@ public:
bool resetAllRenderstates, IMaterialRendererServices* services) bool resetAllRenderstates, IMaterialRendererServices* services)
{ {
Driver->disableTextures(2); Driver->disableTextures(2);
Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates); Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates, true);
if (material.MaterialType != lastMaterial.MaterialType || resetAllRenderstates) if (material.MaterialType != lastMaterial.MaterialType || resetAllRenderstates)
{ {
...@@ -715,7 +722,7 @@ public: ...@@ -715,7 +722,7 @@ public:
bool resetAllRenderstates, IMaterialRendererServices* services) bool resetAllRenderstates, IMaterialRendererServices* services)
{ {
Driver->disableTextures(2); Driver->disableTextures(2);
Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates); Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates, true);
if (material.MaterialType != lastMaterial.MaterialType || resetAllRenderstates) if (material.MaterialType != lastMaterial.MaterialType || resetAllRenderstates)
{ {
...@@ -768,7 +775,7 @@ public: ...@@ -768,7 +775,7 @@ public:
core::matrix4 tmp = Driver->getTransform(ETS_TEXTURE_0); core::matrix4 tmp = Driver->getTransform(ETS_TEXTURE_0);
tmp[5]*=-1; tmp[5]*=-1;
Driver->setTransform(ETS_TEXTURE_0, tmp); Driver->setTransform(ETS_TEXTURE_0, tmp);
Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates); Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates, true);
if (material.MaterialType != lastMaterial.MaterialType || resetAllRenderstates) if (material.MaterialType != lastMaterial.MaterialType || resetAllRenderstates)
{ {
...@@ -800,7 +807,7 @@ public: ...@@ -800,7 +807,7 @@ public:
bool resetAllRenderstates, IMaterialRendererServices* services) bool resetAllRenderstates, IMaterialRendererServices* services)
{ {
Driver->disableTextures(2); Driver->disableTextures(2);
Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates); Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates, true);
if (material.MaterialType != lastMaterial.MaterialType || resetAllRenderstates) if (material.MaterialType != lastMaterial.MaterialType || resetAllRenderstates)
{ {
...@@ -855,7 +862,7 @@ public: ...@@ -855,7 +862,7 @@ public:
bool resetAllRenderstates, IMaterialRendererServices* services) bool resetAllRenderstates, IMaterialRendererServices* services)
{ {
Driver->disableTextures(2); Driver->disableTextures(2);
Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates); Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates, true);
if (material.MaterialType != lastMaterial.MaterialType || resetAllRenderstates) if (material.MaterialType != lastMaterial.MaterialType || resetAllRenderstates)
{ {
......
source/Irrlicht/COpenGLSLMaterialRenderer.cpp
View file @ cc6f569b
...@@ -199,6 +199,8 @@ void COpenGLSLMaterialRenderer::init(s32& outMaterialTypeNr, ...@@ -199,6 +199,8 @@ void COpenGLSLMaterialRenderer::init(s32& outMaterialTypeNr,
bool COpenGLSLMaterialRenderer::OnRender(IMaterialRendererServices* service, bool COpenGLSLMaterialRenderer::OnRender(IMaterialRendererServices* service,
E_VERTEX_TYPE vtxtype) E_VERTEX_TYPE vtxtype)
{ {
Driver->setTextureRenderStates(Driver->getCurrentMaterial(), false, false);
// call callback to set shader constants // call callback to set shader constants
if (CallBack && (Program||Program2)) if (CallBack && (Program||Program2))
CallBack->OnSetConstants(this, UserData); CallBack->OnSetConstants(this, UserData);
......
source/Irrlicht/COpenGLShaderMaterialRenderer.cpp
View file @ cc6f569b
...@@ -120,6 +120,8 @@ void COpenGLShaderMaterialRenderer::init(s32& outMaterialTypeNr, ...@@ -120,6 +120,8 @@ void COpenGLShaderMaterialRenderer::init(s32& outMaterialTypeNr,
bool COpenGLShaderMaterialRenderer::OnRender(IMaterialRendererServices* service, E_VERTEX_TYPE vtxtype) bool COpenGLShaderMaterialRenderer::OnRender(IMaterialRendererServices* service, E_VERTEX_TYPE vtxtype)
{ {
Driver->setTextureRenderStates(Driver->getCurrentMaterial(), false, false);
// call callback to set shader constants // call callback to set shader constants
if (CallBack && (VertexShader || PixelShader[0])) if (CallBack && (VertexShader || PixelShader[0]))
CallBack->OnSetConstants(service, UserData); CallBack->OnSetConstants(service, UserData);
......
source/Irrlicht/COpenGLTexture.cpp
View file @ cc6f569b
...@@ -315,11 +315,9 @@ void COpenGLTexture::uploadTexture(bool newTexture, void* mipmapData, u32 level) ...@@ -315,11 +315,9 @@ void COpenGLTexture::uploadTexture(bool newTexture, void* mipmapData, u32 level)
// make sure we don't change the internal format of existing images // make sure we don't change the internal format of existing images
if (!newTexture) if (!newTexture)
InternalFormat=oldInternalFormat; InternalFormat=oldInternalFormat;
Driver->getBridgeCalls()->setActiveTexture(GL_TEXTURE0_ARB); Driver->setActiveTexture(0, this);
Driver->getBridgeCalls()->setTexture(0, true);
glEnable(GL_TEXTURE_2D);
glBindTexture(GL_TEXTURE_2D, TextureName);
if (Driver->testGLError()) if (Driver->testGLError())
os::Printer::log("Could not bind Texture", ELL_ERROR); os::Printer::log("Could not bind Texture", ELL_ERROR);
...@@ -654,10 +652,8 @@ void COpenGLTexture::bindRTT() ...@@ -654,10 +652,8 @@ void COpenGLTexture::bindRTT()
//! Unbind Render Target Texture //! Unbind Render Target Texture
void COpenGLTexture::unbindRTT() void COpenGLTexture::unbindRTT()
{ {
Driver->getBridgeCalls()->setActiveTexture(GL_TEXTURE0_ARB); Driver->setActiveTexture(0, this);
Driver->getBridgeCalls()->setTexture(0, true);
glEnable(GL_TEXTURE_2D);
glBindTexture(GL_TEXTURE_2D, TextureName);
// Copy Our ViewPort To The Texture // Copy Our ViewPort To The Texture
glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, getSize().Width, getSize().Height); glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, getSize().Width, getSize().Height);
...@@ -707,11 +703,10 @@ COpenGLFBOTexture::COpenGLFBOTexture(const core::dimension2d<u32>& size, ...@@ -707,11 +703,10 @@ COpenGLFBOTexture::COpenGLFBOTexture(const core::dimension2d<u32>& size,
// generate color texture // generate color texture
glGenTextures(1, &TextureName); glGenTextures(1, &TextureName);
Driver->getBridgeCalls()->setActiveTexture(GL_TEXTURE0_ARB); Driver->setActiveTexture(0, this);
Driver->getBridgeCalls()->setTexture(0, true);
glEnable(GL_TEXTURE_2D);
glBindTexture(GL_TEXTURE_2D, TextureName);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, FilteringType); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, FilteringType);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
......
source/Irrlicht/COpenGLTexture.h
View file @ cc6f569b
...@@ -55,8 +55,8 @@ public: ...@@ -55,8 +55,8 @@ public:
//! Cache structure. //! Cache structure.
struct SStatesCache struct SStatesCache
{ {
SStatesCache() : WrapU(ETC_REPEAT), WrapV(ETC_REPEAT), BilinearFilter(true), SStatesCache() : WrapU(ETC_REPEAT), WrapV(ETC_REPEAT), BilinearFilter(false),
TrilinearFilter(false), AnisotropicFilter(0), MipMapStatus(true), IsCached(false), LODBias(0) TrilinearFilter(false), AnisotropicFilter(0), MipMapStatus(false), IsCached(false), LODBias(0)
{ {
} }
......
source/Irrlicht/MacOSX/MacOSX.xcodeproj/project.pbxproj
View file @ cc6f569b
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
archiveVersion = 1; archiveVersion = 1;
classes = { classes = {
}; };
objectVersion = 42; objectVersion = 46;
objects = { objects = {
/* Begin PBXAggregateTarget section */ /* Begin PBXAggregateTarget section */
...@@ -584,6 +584,10 @@ ...@@ -584,6 +584,10 @@
5DD480CA0C7DA66800728AA9 /* CIrrDeviceSDL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5DD480C40C7DA66800728AA9 /* CIrrDeviceSDL.cpp */; }; 5DD480CA0C7DA66800728AA9 /* CIrrDeviceSDL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5DD480C40C7DA66800728AA9 /* CIrrDeviceSDL.cpp */; };
5DD480CB0C7DA66800728AA9 /* COpenGLExtensionHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5DD480C50C7DA66800728AA9 /* COpenGLExtensionHandler.cpp */; }; 5DD480CB0C7DA66800728AA9 /* COpenGLExtensionHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5DD480C50C7DA66800728AA9 /* COpenGLExtensionHandler.cpp */; };
5DD480CC0C7DA66800728AA9 /* CMD3MeshFileLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5DD480C60C7DA66800728AA9 /* CMD3MeshFileLoader.cpp */; }; 5DD480CC0C7DA66800728AA9 /* CMD3MeshFileLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5DD480C60C7DA66800728AA9 /* CMD3MeshFileLoader.cpp */; };
5E5484EC168A959900119951 /* CCgMaterialRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E5484EA168A959800119951 /* CCgMaterialRenderer.cpp */; };
5E5484ED168A959900119951 /* CCgMaterialRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = 5E5484EB168A959900119951 /* CCgMaterialRenderer.h */; };
5E5484F1168A95D500119951 /* COpenGLCgMaterialRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E5484EF168A95D500119951 /* COpenGLCgMaterialRenderer.cpp */; };
5E5484F2168A95D500119951 /* COpenGLCgMaterialRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = 5E5484F0168A95D500119951 /* COpenGLCgMaterialRenderer.h */; };
95154774133CD9DA008D792F /* aabbox3d.h in Headers */ = {isa = PBXBuildFile; fileRef = 4CFA7C0A0A88742800B03626 /* aabbox3d.h */; settings = {ATTRIBUTES = (Public, ); }; }; 95154774133CD9DA008D792F /* aabbox3d.h in Headers */ = {isa = PBXBuildFile; fileRef = 4CFA7C0A0A88742800B03626 /* aabbox3d.h */; settings = {ATTRIBUTES = (Public, ); }; };
95154775133CD9DA008D792F /* CMeshBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = 0910B9FD0D1F64B300D46B04 /* CMeshBuffer.h */; settings = {ATTRIBUTES = (Public, ); }; }; 95154775133CD9DA008D792F /* CMeshBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = 0910B9FD0D1F64B300D46B04 /* CMeshBuffer.h */; settings = {ATTRIBUTES = (Public, ); }; };
95154776133CD9DA008D792F /* coreutil.h in Headers */ = {isa = PBXBuildFile; fileRef = 0910B9FE0D1F64B300D46B04 /* coreutil.h */; settings = {ATTRIBUTES = (Public, ); }; }; 95154776133CD9DA008D792F /* coreutil.h in Headers */ = {isa = PBXBuildFile; fileRef = 0910B9FE0D1F64B300D46B04 /* coreutil.h */; settings = {ATTRIBUTES = (Public, ); }; };
...@@ -2077,6 +2081,10 @@ ...@@ -2077,6 +2081,10 @@
5DD480C40C7DA66800728AA9 /* CIrrDeviceSDL.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CIrrDeviceSDL.cpp; sourceTree = "<group>"; }; 5DD480C40C7DA66800728AA9 /* CIrrDeviceSDL.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CIrrDeviceSDL.cpp; sourceTree = "<group>"; };
5DD480C50C7DA66800728AA9 /* COpenGLExtensionHandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = COpenGLExtensionHandler.cpp; sourceTree = "<group>"; }; 5DD480C50C7DA66800728AA9 /* COpenGLExtensionHandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = COpenGLExtensionHandler.cpp; sourceTree = "<group>"; };
5DD480C60C7DA66800728AA9 /* CMD3MeshFileLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CMD3MeshFileLoader.cpp; sourceTree = "<group>"; }; 5DD480C60C7DA66800728AA9 /* CMD3MeshFileLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CMD3MeshFileLoader.cpp; sourceTree = "<group>"; };
5E5484EA168A959800119951 /* CCgMaterialRenderer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCgMaterialRenderer.cpp; sourceTree = "<group>"; };
5E5484EB168A959900119951 /* CCgMaterialRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCgMaterialRenderer.h; sourceTree = "<group>"; };
5E5484EF168A95D500119951 /* COpenGLCgMaterialRenderer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = COpenGLCgMaterialRenderer.cpp; sourceTree = "<group>"; };
5E5484F0168A95D500119951 /* COpenGLCgMaterialRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = COpenGLCgMaterialRenderer.h; sourceTree = "<group>"; };
959726FD12C18FFC00BF73D3 /* IrrFramework.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = IrrFramework.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 959726FD12C18FFC00BF73D3 /* IrrFramework.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = IrrFramework.framework; sourceTree = BUILT_PRODUCTS_DIR; };
959726FE12C18FFC00BF73D3 /* irrFramework-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "irrFramework-Info.plist"; sourceTree = "<group>"; }; 959726FE12C18FFC00BF73D3 /* irrFramework-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "irrFramework-Info.plist"; sourceTree = "<group>"; };
95972B8312C19A5C00BF73D3 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; }; 95972B8312C19A5C00BF73D3 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; };
...@@ -2884,6 +2892,8 @@ ...@@ -2884,6 +2892,8 @@
0910BA8F0D1F731900D46B04 /* Null */, 0910BA8F0D1F731900D46B04 /* Null */,
0910BA910D1F738100D46B04 /* OpenGL */, 0910BA910D1F738100D46B04 /* OpenGL */,
0910BA920D1F73CC00D46B04 /* Software */, 0910BA920D1F73CC00D46B04 /* Software */,
5E5484EA168A959800119951 /* CCgMaterialRenderer.cpp */,
5E5484EB168A959900119951 /* CCgMaterialRenderer.h */,
4C53DFEE0A484C250014E966 /* CVideoModeList.cpp */, 4C53DFEE0A484C250014E966 /* CVideoModeList.cpp */,
4C53DFEF0A484C250014E966 /* CVideoModeList.h */, 4C53DFEF0A484C250014E966 /* CVideoModeList.h */,
); );
...@@ -2989,8 +2999,10 @@ ...@@ -2989,8 +2999,10 @@
0910BA910D1F738100D46B04 /* OpenGL */ = { 0910BA910D1F738100D46B04 /* OpenGL */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
5DD480700C7D94AC00728AA9 /* glxext.h */,
4C53E0070A484C250014E966 /* glext.h */, 4C53E0070A484C250014E966 /* glext.h */,
5DD480700C7D94AC00728AA9 /* glxext.h */,
5E5484EF168A95D500119951 /* COpenGLCgMaterialRenderer.cpp */,
5E5484F0168A95D500119951 /* COpenGLCgMaterialRenderer.h */,
5DD480C10C7DA66800728AA9 /* COpenGLExtensionHandler.h */, 5DD480C10C7DA66800728AA9 /* COpenGLExtensionHandler.h */,
5DD480C50C7DA66800728AA9 /* COpenGLExtensionHandler.cpp */, 5DD480C50C7DA66800728AA9 /* COpenGLExtensionHandler.cpp */,
4C53DF8C0A484C240014E966 /* COpenGLDriver.cpp */, 4C53DF8C0A484C240014E966 /* COpenGLDriver.cpp */,
...@@ -3973,6 +3985,8 @@ ...@@ -3973,6 +3985,8 @@
0E2E3C5C1103B2AE002DE8D7 /* CIrrDeviceFB.h in Headers */, 0E2E3C5C1103B2AE002DE8D7 /* CIrrDeviceFB.h in Headers */,
0E2E3C5E1103B2AE002DE8D7 /* CIrrDeviceWinCE.h in Headers */, 0E2E3C5E1103B2AE002DE8D7 /* CIrrDeviceWinCE.h in Headers */,
95E5857812FCE2CB004946C6 /* CAnimatedMeshHalfLife.h in Headers */, 95E5857812FCE2CB004946C6 /* CAnimatedMeshHalfLife.h in Headers */,
5E5484ED168A959900119951 /* CCgMaterialRenderer.h in Headers */,
5E5484F2168A95D500119951 /* COpenGLCgMaterialRenderer.h in Headers */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
...@@ -4379,8 +4393,11 @@ ...@@ -4379,8 +4393,11 @@
/* Begin PBXProject section */ /* Begin PBXProject section */
0867D690FE84028FC02AAC07 /* Project object */ = { 0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject; isa = PBXProject;
attributes = {
LastUpgradeCheck = 0450;
};
buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "MacOSX" */; buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "MacOSX" */;
compatibilityVersion = "Xcode 2.4"; compatibilityVersion = "Xcode 3.2";
developmentRegion = English; developmentRegion = English;
hasScannedForEncodings = 1; hasScannedForEncodings = 1;
knownRegions = ( knownRegions = (
...@@ -5386,6 +5403,8 @@ ...@@ -5386,6 +5403,8 @@
95E5858D12FCE388004946C6 /* CTRNormalMap.cpp in Sources */, 95E5858D12FCE388004946C6 /* CTRNormalMap.cpp in Sources */,
95E5859212FCE3A1004946C6 /* CTRStencilShadow.cpp in Sources */, 95E5859212FCE3A1004946C6 /* CTRStencilShadow.cpp in Sources */,
95E5859512FCE3F5004946C6 /* CSMFMeshFileLoader.cpp in Sources */, 95E5859512FCE3F5004946C6 /* CSMFMeshFileLoader.cpp in Sources */,
5E5484EC168A959900119951 /* CCgMaterialRenderer.cpp in Sources */,
5E5484F1168A95D500119951 /* COpenGLCgMaterialRenderer.cpp in Sources */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
...@@ -5598,11 +5617,11 @@ ...@@ -5598,11 +5617,11 @@
09022C600EA0E97F00CD54EE /* Debug */ = { 09022C600EA0E97F00CD54EE /* Debug */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
DSTROOT = ../../../bin/MacOSX; DSTROOT = ../../../bin/MacOSX;
GCC_DYNAMIC_NO_PIC = NO; GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_MODEL_TUNING = G5; GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0; GCC_OPTIMIZATION_LEVEL = 0;
...@@ -5621,7 +5640,6 @@ ...@@ -5621,7 +5640,6 @@
"-framework", "-framework",
AppKit, AppKit,
); );
PREBINDING = NO;
PRODUCT_NAME = GUIEditor_dbg; PRODUCT_NAME = GUIEditor_dbg;
WRAPPER_EXTENSION = app; WRAPPER_EXTENSION = app;
ZERO_LINK = YES; ZERO_LINK = YES;
...@@ -5631,12 +5649,12 @@ ...@@ -5631,12 +5649,12 @@
09022C610EA0E97F00CD54EE /* Release */ = { 09022C610EA0E97F00CD54EE /* Release */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES; COPY_PHASE_STRIP = YES;
DEAD_CODE_STRIPPING = YES; DEAD_CODE_STRIPPING = YES;
DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
DEPLOYMENT_POSTPROCESSING = YES; DEPLOYMENT_POSTPROCESSING = YES;
DSTROOT = ../../../bin/MacOSX; DSTROOT = ../../../bin/MacOSX;
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_MODEL_TUNING = G5; GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PRECOMPILE_PREFIX_HEADER = NO;
...@@ -5655,7 +5673,6 @@ ...@@ -5655,7 +5673,6 @@
"-framework", "-framework",
AppKit, AppKit,
); );
PREBINDING = NO;
PRODUCT_NAME = GUIEditor; PRODUCT_NAME = GUIEditor;
SEPARATE_STRIP = YES; SEPARATE_STRIP = YES;
STRIP_INSTALLED_PRODUCT = YES; STRIP_INSTALLED_PRODUCT = YES;
...@@ -5668,11 +5685,11 @@ ...@@ -5668,11 +5685,11 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ARCHS = "$(NATIVE_ARCH_ACTUAL)"; ARCHS = "$(NATIVE_ARCH_ACTUAL)";
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
DSTROOT = ../../../bin/MacOSX; DSTROOT = ../../../bin/MacOSX;
GCC_DYNAMIC_NO_PIC = NO; GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_MODEL_TUNING = G5; GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0; GCC_OPTIMIZATION_LEVEL = 0;
...@@ -5686,7 +5703,6 @@ ...@@ -5686,7 +5703,6 @@
"-framework", "-framework",
AppKit, AppKit,
); );
PREBINDING = NO;
PRODUCT_NAME = MouseAndJoystick_dbg; PRODUCT_NAME = MouseAndJoystick_dbg;
WRAPPER_EXTENSION = app; WRAPPER_EXTENSION = app;
ZERO_LINK = YES; ZERO_LINK = YES;
...@@ -5697,12 +5713,12 @@ ...@@ -5697,12 +5713,12 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ARCHS = "$(NATIVE_ARCH_ACTUAL)"; ARCHS = "$(NATIVE_ARCH_ACTUAL)";
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES; COPY_PHASE_STRIP = YES;
DEAD_CODE_STRIPPING = YES; DEAD_CODE_STRIPPING = YES;
DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
DEPLOYMENT_POSTPROCESSING = YES; DEPLOYMENT_POSTPROCESSING = YES;
DSTROOT = ../../../bin/MacOSX; DSTROOT = ../../../bin/MacOSX;
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_MODEL_TUNING = G5; GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PRECOMPILE_PREFIX_HEADER = NO;
...@@ -5716,7 +5732,6 @@ ...@@ -5716,7 +5732,6 @@
"-framework", "-framework",
AppKit, AppKit,
); );
PREBINDING = NO;
PRODUCT_NAME = MouseAndJoystick; PRODUCT_NAME = MouseAndJoystick;
SEPARATE_STRIP = YES; SEPARATE_STRIP = YES;
STRIP_INSTALLED_PRODUCT = YES; STRIP_INSTALLED_PRODUCT = YES;
...@@ -5728,11 +5743,11 @@ ...@@ -5728,11 +5743,11 @@
09F649010D2CDED9001E0599 /* Debug */ = { 09F649010D2CDED9001E0599 /* Debug */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
DSTROOT = ../../../bin/MacOSX; DSTROOT = ../../../bin/MacOSX;
GCC_DYNAMIC_NO_PIC = NO; GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_MODEL_TUNING = G5; GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0; GCC_OPTIMIZATION_LEVEL = 0;
...@@ -5751,7 +5766,6 @@ ...@@ -5751,7 +5766,6 @@
"-framework", "-framework",
AppKit, AppKit,
); );
PREBINDING = NO;
PRODUCT_NAME = HelloWorld_dbg; PRODUCT_NAME = HelloWorld_dbg;
WRAPPER_EXTENSION = app; WRAPPER_EXTENSION = app;
ZERO_LINK = YES; ZERO_LINK = YES;
...@@ -5761,12 +5775,12 @@ ...@@ -5761,12 +5775,12 @@
09F649020D2CDED9001E0599 /* Release */ = { 09F649020D2CDED9001E0599 /* Release */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES; COPY_PHASE_STRIP = YES;
DEAD_CODE_STRIPPING = YES; DEAD_CODE_STRIPPING = YES;
DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
DEPLOYMENT_POSTPROCESSING = YES; DEPLOYMENT_POSTPROCESSING = YES;
DSTROOT = ../../../bin/MacOSX; DSTROOT = ../../../bin/MacOSX;
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_MODEL_TUNING = G5; GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PRECOMPILE_PREFIX_HEADER = NO;
...@@ -5785,7 +5799,6 @@ ...@@ -5785,7 +5799,6 @@
"-framework", "-framework",
AppKit, AppKit,
); );
PREBINDING = NO;
PRODUCT_NAME = HelloWorld; PRODUCT_NAME = HelloWorld;
SEPARATE_STRIP = YES; SEPARATE_STRIP = YES;
STRIP_INSTALLED_PRODUCT = YES; STRIP_INSTALLED_PRODUCT = YES;
...@@ -5797,11 +5810,11 @@ ...@@ -5797,11 +5810,11 @@
09F6493C0D2CE03E001E0599 /* Debug */ = { 09F6493C0D2CE03E001E0599 /* Debug */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
DSTROOT = ../../../bin/MacOSX; DSTROOT = ../../../bin/MacOSX;
GCC_DYNAMIC_NO_PIC = NO; GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_MODEL_TUNING = G5; GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0; GCC_OPTIMIZATION_LEVEL = 0;
...@@ -5820,7 +5833,6 @@ ...@@ -5820,7 +5833,6 @@
"-framework", "-framework",
AppKit, AppKit,
); );
PREBINDING = NO;
PRODUCT_NAME = LoadIrrFile_dbg; PRODUCT_NAME = LoadIrrFile_dbg;
WRAPPER_EXTENSION = app; WRAPPER_EXTENSION = app;
ZERO_LINK = YES; ZERO_LINK = YES;
...@@ -5830,12 +5842,12 @@ ...@@ -5830,12 +5842,12 @@
09F6493D0D2CE03E001E0599 /* Release */ = { 09F6493D0D2CE03E001E0599 /* Release */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES; COPY_PHASE_STRIP = YES;
DEAD_CODE_STRIPPING = YES; DEAD_CODE_STRIPPING = YES;
DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
DEPLOYMENT_POSTPROCESSING = YES; DEPLOYMENT_POSTPROCESSING = YES;
DSTROOT = ../../../bin/MacOSX; DSTROOT = ../../../bin/MacOSX;
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_MODEL_TUNING = G5; GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PRECOMPILE_PREFIX_HEADER = NO;
...@@ -5854,7 +5866,6 @@ ...@@ -5854,7 +5866,6 @@
"-framework", "-framework",
AppKit, AppKit,
); );
PREBINDING = NO;
PRODUCT_NAME = LoadIrrFile; PRODUCT_NAME = LoadIrrFile;
SEPARATE_STRIP = YES; SEPARATE_STRIP = YES;
STRIP_INSTALLED_PRODUCT = YES; STRIP_INSTALLED_PRODUCT = YES;
...@@ -5866,11 +5877,11 @@ ...@@ -5866,11 +5877,11 @@
09F649630D2CE206001E0599 /* Debug */ = { 09F649630D2CE206001E0599 /* Debug */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
DSTROOT = ../../../bin/MacOSX; DSTROOT = ../../../bin/MacOSX;
GCC_DYNAMIC_NO_PIC = NO; GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_MODEL_TUNING = G5; GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0; GCC_OPTIMIZATION_LEVEL = 0;
...@@ -5889,7 +5900,6 @@ ...@@ -5889,7 +5900,6 @@
"-framework", "-framework",
AppKit, AppKit,
); );
PREBINDING = NO;
PRODUCT_NAME = Quake3Shader_dbg; PRODUCT_NAME = Quake3Shader_dbg;
WRAPPER_EXTENSION = app; WRAPPER_EXTENSION = app;
ZERO_LINK = YES; ZERO_LINK = YES;
...@@ -5899,12 +5909,12 @@ ...@@ -5899,12 +5909,12 @@
09F649640D2CE206001E0599 /* Release */ = { 09F649640D2CE206001E0599 /* Release */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES; COPY_PHASE_STRIP = YES;
DEAD_CODE_STRIPPING = YES; DEAD_CODE_STRIPPING = YES;
DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
DEPLOYMENT_POSTPROCESSING = YES; DEPLOYMENT_POSTPROCESSING = YES;
DSTROOT = ../../../bin/MacOSX; DSTROOT = ../../../bin/MacOSX;
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_MODEL_TUNING = G5; GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PRECOMPILE_PREFIX_HEADER = NO;
...@@ -5923,7 +5933,6 @@ ...@@ -5923,7 +5933,6 @@
"-framework", "-framework",
AppKit, AppKit,
); );
PREBINDING = NO;
PRODUCT_NAME = Quake3Shader; PRODUCT_NAME = Quake3Shader;
SEPARATE_STRIP = YES; SEPARATE_STRIP = YES;
STRIP_INSTALLED_PRODUCT = YES; STRIP_INSTALLED_PRODUCT = YES;
...@@ -5936,11 +5945,11 @@ ...@@ -5936,11 +5945,11 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ARCHS = "$(NATIVE_ARCH_ACTUAL)"; ARCHS = "$(NATIVE_ARCH_ACTUAL)";
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
DSTROOT = ../../../bin/MacOSX; DSTROOT = ../../../bin/MacOSX;
GCC_DYNAMIC_NO_PIC = NO; GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_MODEL_TUNING = G5; GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0; GCC_OPTIMIZATION_LEVEL = 0;
...@@ -5954,7 +5963,6 @@ ...@@ -5954,7 +5963,6 @@
"-framework", "-framework",
AppKit, AppKit,
); );
PREBINDING = NO;
PRODUCT_NAME = SplitScreen_dbg; PRODUCT_NAME = SplitScreen_dbg;
WRAPPER_EXTENSION = app; WRAPPER_EXTENSION = app;
ZERO_LINK = YES; ZERO_LINK = YES;
...@@ -5965,12 +5973,12 @@ ...@@ -5965,12 +5973,12 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ARCHS = "$(NATIVE_ARCH_ACTUAL)"; ARCHS = "$(NATIVE_ARCH_ACTUAL)";
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES; COPY_PHASE_STRIP = YES;
DEAD_CODE_STRIPPING = YES; DEAD_CODE_STRIPPING = YES;
DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
DEPLOYMENT_POSTPROCESSING = YES; DEPLOYMENT_POSTPROCESSING = YES;
DSTROOT = ../../../bin/MacOSX; DSTROOT = ../../../bin/MacOSX;
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_MODEL_TUNING = G5; GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PRECOMPILE_PREFIX_HEADER = NO;
...@@ -5984,7 +5992,6 @@ ...@@ -5984,7 +5992,6 @@
"-framework", "-framework",
AppKit, AppKit,
); );
PREBINDING = NO;
PRODUCT_NAME = SplitScreen; PRODUCT_NAME = SplitScreen;
SEPARATE_STRIP = YES; SEPARATE_STRIP = YES;
STRIP_INSTALLED_PRODUCT = YES; STRIP_INSTALLED_PRODUCT = YES;
...@@ -5997,11 +6004,11 @@ ...@@ -5997,11 +6004,11 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ARCHS = "$(NATIVE_ARCH_ACTUAL)"; ARCHS = "$(NATIVE_ARCH_ACTUAL)";
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
DSTROOT = ../../../bin/MacOSX; DSTROOT = ../../../bin/MacOSX;
GCC_DYNAMIC_NO_PIC = NO; GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_MODEL_TUNING = G5; GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0; GCC_OPTIMIZATION_LEVEL = 0;
...@@ -6015,7 +6022,6 @@ ...@@ -6015,7 +6022,6 @@
"-framework", "-framework",
AppKit, AppKit,
); );
PREBINDING = NO;
PRODUCT_NAME = ManagedLights_dbg; PRODUCT_NAME = ManagedLights_dbg;
WRAPPER_EXTENSION = app; WRAPPER_EXTENSION = app;
ZERO_LINK = YES; ZERO_LINK = YES;
...@@ -6026,12 +6032,12 @@ ...@@ -6026,12 +6032,12 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ARCHS = "$(NATIVE_ARCH_ACTUAL)"; ARCHS = "$(NATIVE_ARCH_ACTUAL)";
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES; COPY_PHASE_STRIP = YES;
DEAD_CODE_STRIPPING = YES; DEAD_CODE_STRIPPING = YES;
DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
DEPLOYMENT_POSTPROCESSING = YES; DEPLOYMENT_POSTPROCESSING = YES;
DSTROOT = ../../../bin/MacOSX; DSTROOT = ../../../bin/MacOSX;
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_MODEL_TUNING = G5; GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PRECOMPILE_PREFIX_HEADER = NO;
...@@ -6045,7 +6051,6 @@ ...@@ -6045,7 +6051,6 @@
"-framework", "-framework",
AppKit, AppKit,
); );
PREBINDING = NO;
PRODUCT_NAME = ManagedLights; PRODUCT_NAME = ManagedLights;
SEPARATE_STRIP = YES; SEPARATE_STRIP = YES;
STRIP_INSTALLED_PRODUCT = YES; STRIP_INSTALLED_PRODUCT = YES;
...@@ -6058,9 +6063,9 @@ ...@@ -6058,9 +6063,9 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ARCHS = "$(NATIVE_ARCH_ACTUAL)"; ARCHS = "$(NATIVE_ARCH_ACTUAL)";
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO; GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_MODEL_TUNING = G5; GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0; GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES;
...@@ -6077,6 +6082,7 @@ ...@@ -6077,6 +6082,7 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ARCHS = "$(NATIVE_ARCH_ACTUAL)"; ARCHS = "$(NATIVE_ARCH_ACTUAL)";
COMBINE_HIDPI_IMAGES = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_MODEL_TUNING = G5; GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PRECOMPILE_PREFIX_HEADER = NO;
...@@ -6099,7 +6105,6 @@ ...@@ -6099,7 +6105,6 @@
"-DMACOSX", "-DMACOSX",
"-D_DEBUG", "-D_DEBUG",
); );
PREBINDING = NO;
SDKROOT = ""; SDKROOT = "";
}; };
name = Debug; name = Debug;
...@@ -6118,7 +6123,6 @@ ...@@ -6118,7 +6123,6 @@
HEADER_SEARCH_PATHS = ../../../include; HEADER_SEARCH_PATHS = ../../../include;
INSTALL_MODE_FLAG = "a+rwx"; INSTALL_MODE_FLAG = "a+rwx";
OTHER_CFLAGS = "-DMACOSX"; OTHER_CFLAGS = "-DMACOSX";
PREBINDING = NO;
SDKROOT = ""; SDKROOT = "";
}; };
name = Release; name = Release;
...@@ -6127,12 +6131,12 @@ ...@@ -6127,12 +6131,12 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO; ALWAYS_SEARCH_USER_PATHS = NO;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1; DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_VERSION = A; FRAMEWORK_VERSION = A;
GCC_DYNAMIC_NO_PIC = NO; GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_INLINES_ARE_PRIVATE_EXTERN = NO; GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
GCC_MODEL_TUNING = G5; GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0; GCC_OPTIMIZATION_LEVEL = 0;
...@@ -6153,7 +6157,6 @@ ...@@ -6153,7 +6157,6 @@
"-read_only_relocs", "-read_only_relocs",
suppress, suppress,
); );
PREBINDING = NO;
PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO; PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO;
PRODUCT_NAME = IrrFramework; PRODUCT_NAME = IrrFramework;
SHARED_PRECOMPS_DIR = ""; SHARED_PRECOMPS_DIR = "";
...@@ -6164,13 +6167,13 @@ ...@@ -6164,13 +6167,13 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO; ALWAYS_SEARCH_USER_PATHS = NO;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES; COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1; DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_VERSION = A; FRAMEWORK_VERSION = A;
GCC_DYNAMIC_NO_PIC = NO; GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_INLINES_ARE_PRIVATE_EXTERN = NO; GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
GCC_MODEL_TUNING = G5; GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PRECOMPILE_PREFIX_HEADER = NO;
...@@ -6190,7 +6193,6 @@ ...@@ -6190,7 +6193,6 @@
"-read_only_relocs", "-read_only_relocs",
suppress, suppress,
); );
PREBINDING = NO;
PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO; PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO;
PRODUCT_NAME = IrrFramework; PRODUCT_NAME = IrrFramework;
SHARED_PRECOMPS_DIR = ""; SHARED_PRECOMPS_DIR = "";
...@@ -6201,11 +6203,11 @@ ...@@ -6201,11 +6203,11 @@
B81CFE0D097FD9F50057C06F /* Debug */ = { B81CFE0D097FD9F50057C06F /* Debug */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
DSTROOT = ../../../bin/MacOSX; DSTROOT = ../../../bin/MacOSX;
GCC_DYNAMIC_NO_PIC = NO; GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_MODEL_TUNING = G5; GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0; GCC_OPTIMIZATION_LEVEL = 0;
...@@ -6219,7 +6221,6 @@ ...@@ -6219,7 +6221,6 @@
"-framework", "-framework",
AppKit, AppKit,
); );
PREBINDING = NO;
PRODUCT_NAME = 2DGraphics_dbg; PRODUCT_NAME = 2DGraphics_dbg;
WRAPPER_EXTENSION = app; WRAPPER_EXTENSION = app;
ZERO_LINK = YES; ZERO_LINK = YES;
...@@ -6229,12 +6230,12 @@ ...@@ -6229,12 +6230,12 @@
B81CFE0E097FD9F50057C06F /* Release */ = { B81CFE0E097FD9F50057C06F /* Release */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES; COPY_PHASE_STRIP = YES;
DEAD_CODE_STRIPPING = YES; DEAD_CODE_STRIPPING = YES;
DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
DEPLOYMENT_POSTPROCESSING = YES; DEPLOYMENT_POSTPROCESSING = YES;
DSTROOT = ../../../bin/MacOSX; DSTROOT = ../../../bin/MacOSX;
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_MODEL_TUNING = G5; GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PRECOMPILE_PREFIX_HEADER = NO;
...@@ -6248,7 +6249,6 @@ ...@@ -6248,7 +6249,6 @@
"-framework", "-framework",
AppKit, AppKit,
); );
PREBINDING = NO;
PRODUCT_NAME = 2DGraphics; PRODUCT_NAME = 2DGraphics;
SEPARATE_STRIP = YES; SEPARATE_STRIP = YES;
STRIP_INSTALLED_PRODUCT = YES; STRIP_INSTALLED_PRODUCT = YES;
...@@ -6260,11 +6260,11 @@ ...@@ -6260,11 +6260,11 @@
B81CFE8E097FDDE20057C06F /* Debug */ = { B81CFE8E097FDDE20057C06F /* Debug */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
DSTROOT = ../../../bin/MacOSX; DSTROOT = ../../../bin/MacOSX;
GCC_DYNAMIC_NO_PIC = NO; GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_MODEL_TUNING = G5; GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0; GCC_OPTIMIZATION_LEVEL = 0;
...@@ -6278,7 +6278,6 @@ ...@@ -6278,7 +6278,6 @@
"-framework", "-framework",
AppKit, AppKit,
); );
PREBINDING = NO;
PRODUCT_NAME = Collision_dbg; PRODUCT_NAME = Collision_dbg;
WRAPPER_EXTENSION = app; WRAPPER_EXTENSION = app;
ZERO_LINK = YES; ZERO_LINK = YES;
...@@ -6288,12 +6287,12 @@ ...@@ -6288,12 +6287,12 @@
B81CFE8F097FDDE20057C06F /* Release */ = { B81CFE8F097FDDE20057C06F /* Release */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES; COPY_PHASE_STRIP = YES;
DEAD_CODE_STRIPPING = YES; DEAD_CODE_STRIPPING = YES;
DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
DEPLOYMENT_POSTPROCESSING = YES; DEPLOYMENT_POSTPROCESSING = YES;
DSTROOT = ../../../bin/MacOSX; DSTROOT = ../../../bin/MacOSX;
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_MODEL_TUNING = G5; GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PRECOMPILE_PREFIX_HEADER = NO;
...@@ -6307,7 +6306,6 @@ ...@@ -6307,7 +6306,6 @@
"-framework", "-framework",
AppKit, AppKit,
); );
PREBINDING = NO;
PRODUCT_NAME = Collision; PRODUCT_NAME = Collision;
SEPARATE_STRIP = YES; SEPARATE_STRIP = YES;
STRIP_INSTALLED_PRODUCT = YES; STRIP_INSTALLED_PRODUCT = YES;
...@@ -6319,11 +6317,11 @@ ...@@ -6319,11 +6317,11 @@
B81CFEB0097FDE900057C06F /* Debug */ = { B81CFEB0097FDE900057C06F /* Debug */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
DSTROOT = ../../../bin/MacOSX; DSTROOT = ../../../bin/MacOSX;
GCC_DYNAMIC_NO_PIC = NO; GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_MODEL_TUNING = G5; GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0; GCC_OPTIMIZATION_LEVEL = 0;
...@@ -6337,7 +6335,6 @@ ...@@ -6337,7 +6335,6 @@
"-framework", "-framework",
AppKit, AppKit,
); );
PREBINDING = NO;
PRODUCT_NAME = PerPixelLighting_dbg; PRODUCT_NAME = PerPixelLighting_dbg;
WRAPPER_EXTENSION = app; WRAPPER_EXTENSION = app;
ZERO_LINK = YES; ZERO_LINK = YES;
...@@ -6347,12 +6344,12 @@ ...@@ -6347,12 +6344,12 @@
B81CFEB1097FDE900057C06F /* Release */ = { B81CFEB1097FDE900057C06F /* Release */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES; COPY_PHASE_STRIP = YES;
DEAD_CODE_STRIPPING = YES; DEAD_CODE_STRIPPING = YES;
DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
DEPLOYMENT_POSTPROCESSING = YES; DEPLOYMENT_POSTPROCESSING = YES;
DSTROOT = ../../../bin/MacOSX; DSTROOT = ../../../bin/MacOSX;
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_MODEL_TUNING = G5; GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PRECOMPILE_PREFIX_HEADER = NO;
...@@ -6367,7 +6364,6 @@ ...@@ -6367,7 +6364,6 @@
"-framework", "-framework",
AppKit, AppKit,
); );
PREBINDING = NO;
PRODUCT_NAME = PerPixelLighting; PRODUCT_NAME = PerPixelLighting;
SEPARATE_STRIP = YES; SEPARATE_STRIP = YES;
STRIP_INSTALLED_PRODUCT = YES; STRIP_INSTALLED_PRODUCT = YES;
...@@ -6379,11 +6375,11 @@ ...@@ -6379,11 +6375,11 @@
B81CFECE097FDF020057C06F /* Debug */ = { B81CFECE097FDF020057C06F /* Debug */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
DSTROOT = ../../../bin/MacOSX; DSTROOT = ../../../bin/MacOSX;
GCC_DYNAMIC_NO_PIC = NO; GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_MODEL_TUNING = G5; GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0; GCC_OPTIMIZATION_LEVEL = 0;
...@@ -6397,7 +6393,6 @@ ...@@ -6397,7 +6393,6 @@
"-framework", "-framework",
AppKit, AppKit,
); );
PREBINDING = NO;
PRODUCT_NAME = TerrainRendering_dbg; PRODUCT_NAME = TerrainRendering_dbg;
WRAPPER_EXTENSION = app; WRAPPER_EXTENSION = app;
ZERO_LINK = YES; ZERO_LINK = YES;
...@@ -6407,12 +6402,12 @@ ...@@ -6407,12 +6402,12 @@
B81CFECF097FDF020057C06F /* Release */ = { B81CFECF097FDF020057C06F /* Release */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES; COPY_PHASE_STRIP = YES;
DEAD_CODE_STRIPPING = YES; DEAD_CODE_STRIPPING = YES;
DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
DEPLOYMENT_POSTPROCESSING = YES; DEPLOYMENT_POSTPROCESSING = YES;
DSTROOT = ../../../bin/MacOSX; DSTROOT = ../../../bin/MacOSX;
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_MODEL_TUNING = G5; GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PRECOMPILE_PREFIX_HEADER = NO;
...@@ -6426,7 +6421,6 @@ ...@@ -6426,7 +6421,6 @@
"-framework", "-framework",
AppKit, AppKit,
); );
PREBINDING = NO;
PRODUCT_NAME = TerrainRendering; PRODUCT_NAME = TerrainRendering;
SEPARATE_STRIP = YES; SEPARATE_STRIP = YES;
STRIP_INSTALLED_PRODUCT = YES; STRIP_INSTALLED_PRODUCT = YES;
...@@ -6438,11 +6432,11 @@ ...@@ -6438,11 +6432,11 @@
B81CFEF4097FE05F0057C06F /* Debug */ = { B81CFEF4097FE05F0057C06F /* Debug */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
DSTROOT = ../../../bin/MacOSX; DSTROOT = ../../../bin/MacOSX;
GCC_DYNAMIC_NO_PIC = NO; GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_MODEL_TUNING = G5; GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0; GCC_OPTIMIZATION_LEVEL = 0;
...@@ -6456,7 +6450,6 @@ ...@@ -6456,7 +6450,6 @@
"-framework", "-framework",
AppKit, AppKit,
); );
PREBINDING = NO;
PRODUCT_NAME = SpecialFx_dbg; PRODUCT_NAME = SpecialFx_dbg;
WRAPPER_EXTENSION = app; WRAPPER_EXTENSION = app;
ZERO_LINK = YES; ZERO_LINK = YES;
...@@ -6466,12 +6459,12 @@ ...@@ -6466,12 +6459,12 @@
B81CFEF5097FE05F0057C06F /* Release */ = { B81CFEF5097FE05F0057C06F /* Release */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES; COPY_PHASE_STRIP = YES;
DEAD_CODE_STRIPPING = YES; DEAD_CODE_STRIPPING = YES;
DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
DEPLOYMENT_POSTPROCESSING = YES; DEPLOYMENT_POSTPROCESSING = YES;
DSTROOT = ../../../bin/MacOSX; DSTROOT = ../../../bin/MacOSX;
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_MODEL_TUNING = G5; GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PRECOMPILE_PREFIX_HEADER = NO;
...@@ -6485,7 +6478,6 @@ ...@@ -6485,7 +6478,6 @@
"-framework", "-framework",
AppKit, AppKit,
); );
PREBINDING = NO;
PRODUCT_NAME = SpecialFx; PRODUCT_NAME = SpecialFx;
SEPARATE_STRIP = YES; SEPARATE_STRIP = YES;
STRIP_INSTALLED_PRODUCT = YES; STRIP_INSTALLED_PRODUCT = YES;
...@@ -6497,11 +6489,11 @@ ...@@ -6497,11 +6489,11 @@
B81CFF13097FE13E0057C06F /* Debug */ = { B81CFF13097FE13E0057C06F /* Debug */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
DSTROOT = ../../../bin/MacOSX; DSTROOT = ../../../bin/MacOSX;
GCC_DYNAMIC_NO_PIC = NO; GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_MODEL_TUNING = G5; GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0; GCC_OPTIMIZATION_LEVEL = 0;
...@@ -6515,7 +6507,6 @@ ...@@ -6515,7 +6507,6 @@
"-framework", "-framework",
AppKit, AppKit,
); );
PREBINDING = NO;
PRODUCT_NAME = UserInterface_dbg; PRODUCT_NAME = UserInterface_dbg;
SDKROOT = ""; SDKROOT = "";
WRAPPER_EXTENSION = app; WRAPPER_EXTENSION = app;
...@@ -6526,12 +6517,12 @@ ...@@ -6526,12 +6517,12 @@
B81CFF14097FE13E0057C06F /* Release */ = { B81CFF14097FE13E0057C06F /* Release */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES; COPY_PHASE_STRIP = YES;
DEAD_CODE_STRIPPING = YES; DEAD_CODE_STRIPPING = YES;
DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
DEPLOYMENT_POSTPROCESSING = YES; DEPLOYMENT_POSTPROCESSING = YES;
DSTROOT = ../../../bin/MacOSX; DSTROOT = ../../../bin/MacOSX;
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_MODEL_TUNING = G5; GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PRECOMPILE_PREFIX_HEADER = NO;
...@@ -6545,7 +6536,6 @@ ...@@ -6545,7 +6536,6 @@
"-framework", "-framework",
AppKit, AppKit,
); );
PREBINDING = NO;
PRODUCT_NAME = UserInterface; PRODUCT_NAME = UserInterface;
SDKROOT = ""; SDKROOT = "";
SEPARATE_STRIP = YES; SEPARATE_STRIP = YES;
...@@ -6558,11 +6548,11 @@ ...@@ -6558,11 +6548,11 @@
B81CFF2A097FE1E00057C06F /* Debug */ = { B81CFF2A097FE1E00057C06F /* Debug */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
DSTROOT = ../../../bin/MacOSX; DSTROOT = ../../../bin/MacOSX;
GCC_DYNAMIC_NO_PIC = NO; GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_MODEL_TUNING = G5; GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0; GCC_OPTIMIZATION_LEVEL = 0;
...@@ -6576,7 +6566,6 @@ ...@@ -6576,7 +6566,6 @@
"-framework", "-framework",
AppKit, AppKit,
); );
PREBINDING = NO;
PRODUCT_NAME = CustomSceneNode_dbg; PRODUCT_NAME = CustomSceneNode_dbg;
WRAPPER_EXTENSION = app; WRAPPER_EXTENSION = app;
ZERO_LINK = YES; ZERO_LINK = YES;
...@@ -6586,12 +6575,12 @@ ...@@ -6586,12 +6575,12 @@
B81CFF2B097FE1E00057C06F /* Release */ = { B81CFF2B097FE1E00057C06F /* Release */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES; COPY_PHASE_STRIP = YES;
DEAD_CODE_STRIPPING = YES; DEAD_CODE_STRIPPING = YES;
DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
DEPLOYMENT_POSTPROCESSING = YES; DEPLOYMENT_POSTPROCESSING = YES;
DSTROOT = ../../../bin/MacOSX; DSTROOT = ../../../bin/MacOSX;
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_MODEL_TUNING = G5; GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PRECOMPILE_PREFIX_HEADER = NO;
...@@ -6605,7 +6594,6 @@ ...@@ -6605,7 +6594,6 @@
"-framework", "-framework",
AppKit, AppKit,
); );
PREBINDING = NO;
PRODUCT_NAME = CustomSceneNode; PRODUCT_NAME = CustomSceneNode;
SEPARATE_STRIP = YES; SEPARATE_STRIP = YES;
STRIP_INSTALLED_PRODUCT = YES; STRIP_INSTALLED_PRODUCT = YES;
...@@ -6618,11 +6606,11 @@ ...@@ -6618,11 +6606,11 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ARCHS = "$(NATIVE_ARCH_ACTUAL)"; ARCHS = "$(NATIVE_ARCH_ACTUAL)";
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
DSTROOT = ../../../bin/MacOSX; DSTROOT = ../../../bin/MacOSX;
GCC_DYNAMIC_NO_PIC = NO; GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_MODEL_TUNING = G5; GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0; GCC_OPTIMIZATION_LEVEL = 0;
...@@ -6641,7 +6629,6 @@ ...@@ -6641,7 +6629,6 @@
"-framework", "-framework",
AppKit, AppKit,
); );
PREBINDING = NO;
PRODUCT_NAME = Quake3Map_dbg; PRODUCT_NAME = Quake3Map_dbg;
SDKROOT = ""; SDKROOT = "";
WRAPPER_EXTENSION = app; WRAPPER_EXTENSION = app;
...@@ -6653,12 +6640,12 @@ ...@@ -6653,12 +6640,12 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ARCHS = "$(NATIVE_ARCH_ACTUAL)"; ARCHS = "$(NATIVE_ARCH_ACTUAL)";
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES; COPY_PHASE_STRIP = YES;
DEAD_CODE_STRIPPING = YES; DEAD_CODE_STRIPPING = YES;
DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
DEPLOYMENT_POSTPROCESSING = YES; DEPLOYMENT_POSTPROCESSING = YES;
DSTROOT = ../../../bin/MacOSX; DSTROOT = ../../../bin/MacOSX;
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_MODEL_TUNING = G5; GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PRECOMPILE_PREFIX_HEADER = NO;
...@@ -6677,7 +6664,6 @@ ...@@ -6677,7 +6664,6 @@
"-framework", "-framework",
AppKit, AppKit,
); );
PREBINDING = NO;
PRODUCT_NAME = Quake3Map; PRODUCT_NAME = Quake3Map;
SDKROOT = ""; SDKROOT = "";
SEPARATE_STRIP = YES; SEPARATE_STRIP = YES;
...@@ -6690,11 +6676,11 @@ ...@@ -6690,11 +6676,11 @@
B81CFF56097FE3050057C06F /* Debug */ = { B81CFF56097FE3050057C06F /* Debug */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
DSTROOT = ../../../bin/MacOSX; DSTROOT = ../../../bin/MacOSX;
GCC_DYNAMIC_NO_PIC = NO; GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_MODEL_TUNING = G5; GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0; GCC_OPTIMIZATION_LEVEL = 0;
...@@ -6708,7 +6694,6 @@ ...@@ -6708,7 +6694,6 @@
"-framework", "-framework",
AppKit, AppKit,
); );
PREBINDING = NO;
PRODUCT_NAME = Shaders_dbg; PRODUCT_NAME = Shaders_dbg;
WRAPPER_EXTENSION = app; WRAPPER_EXTENSION = app;
ZERO_LINK = YES; ZERO_LINK = YES;
...@@ -6718,12 +6703,12 @@ ...@@ -6718,12 +6703,12 @@
B81CFF57097FE3050057C06F /* Release */ = { B81CFF57097FE3050057C06F /* Release */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES; COPY_PHASE_STRIP = YES;
DEAD_CODE_STRIPPING = YES; DEAD_CODE_STRIPPING = YES;
DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
DEPLOYMENT_POSTPROCESSING = YES; DEPLOYMENT_POSTPROCESSING = YES;
DSTROOT = ../../../bin/MacOSX; DSTROOT = ../../../bin/MacOSX;
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_MODEL_TUNING = G5; GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PRECOMPILE_PREFIX_HEADER = NO;
...@@ -6737,7 +6722,6 @@ ...@@ -6737,7 +6722,6 @@
"-framework", "-framework",
AppKit, AppKit,
); );
PREBINDING = NO;
PRODUCT_NAME = Shaders; PRODUCT_NAME = Shaders;
SEPARATE_STRIP = YES; SEPARATE_STRIP = YES;
STRIP_INSTALLED_PRODUCT = YES; STRIP_INSTALLED_PRODUCT = YES;
...@@ -6750,11 +6734,11 @@ ...@@ -6750,11 +6734,11 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ARCHS = "$(NATIVE_ARCH_ACTUAL)"; ARCHS = "$(NATIVE_ARCH_ACTUAL)";
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
DSTROOT = ../../../bin/MacOSX; DSTROOT = ../../../bin/MacOSX;
GCC_DYNAMIC_NO_PIC = NO; GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_MODEL_TUNING = G5; GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0; GCC_OPTIMIZATION_LEVEL = 0;
...@@ -6768,7 +6752,6 @@ ...@@ -6768,7 +6752,6 @@
"-framework", "-framework",
AppKit, AppKit,
); );
PREBINDING = NO;
PRODUCT_NAME = Movement_dbg; PRODUCT_NAME = Movement_dbg;
WRAPPER_EXTENSION = app; WRAPPER_EXTENSION = app;
ZERO_LINK = YES; ZERO_LINK = YES;
...@@ -6779,12 +6762,12 @@ ...@@ -6779,12 +6762,12 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ARCHS = "$(NATIVE_ARCH_ACTUAL)"; ARCHS = "$(NATIVE_ARCH_ACTUAL)";
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES; COPY_PHASE_STRIP = YES;
DEAD_CODE_STRIPPING = YES; DEAD_CODE_STRIPPING = YES;
DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
DEPLOYMENT_POSTPROCESSING = YES; DEPLOYMENT_POSTPROCESSING = YES;
DSTROOT = ../../../bin/MacOSX; DSTROOT = ../../../bin/MacOSX;
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_MODEL_TUNING = G5; GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PRECOMPILE_PREFIX_HEADER = NO;
...@@ -6798,7 +6781,6 @@ ...@@ -6798,7 +6781,6 @@
"-framework", "-framework",
AppKit, AppKit,
); );
PREBINDING = NO;
PRODUCT_NAME = Movement; PRODUCT_NAME = Movement;
SEPARATE_STRIP = YES; SEPARATE_STRIP = YES;
STRIP_INSTALLED_PRODUCT = YES; STRIP_INSTALLED_PRODUCT = YES;
...@@ -6811,11 +6793,11 @@ ...@@ -6811,11 +6793,11 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ARCHS = "$(NATIVE_ARCH_ACTUAL)"; ARCHS = "$(NATIVE_ARCH_ACTUAL)";
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
DSTROOT = ../../../bin/MacOSX; DSTROOT = ../../../bin/MacOSX;
GCC_DYNAMIC_NO_PIC = NO; GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_MODEL_TUNING = G5; GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0; GCC_OPTIMIZATION_LEVEL = 0;
...@@ -6829,7 +6811,6 @@ ...@@ -6829,7 +6811,6 @@
"-framework", "-framework",
AppKit, AppKit,
); );
PREBINDING = NO;
PRODUCT_NAME = MeshViewer_dbg; PRODUCT_NAME = MeshViewer_dbg;
SDKROOT = ""; SDKROOT = "";
WRAPPER_EXTENSION = app; WRAPPER_EXTENSION = app;
...@@ -6841,12 +6822,12 @@ ...@@ -6841,12 +6822,12 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ARCHS = "$(NATIVE_ARCH_ACTUAL)"; ARCHS = "$(NATIVE_ARCH_ACTUAL)";
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES; COPY_PHASE_STRIP = YES;
DEAD_CODE_STRIPPING = YES; DEAD_CODE_STRIPPING = YES;
DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
DEPLOYMENT_POSTPROCESSING = YES; DEPLOYMENT_POSTPROCESSING = YES;
DSTROOT = ../../../bin/MacOSX; DSTROOT = ../../../bin/MacOSX;
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_MODEL_TUNING = G5; GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PRECOMPILE_PREFIX_HEADER = NO;
...@@ -6860,7 +6841,6 @@ ...@@ -6860,7 +6841,6 @@
"-framework", "-framework",
AppKit, AppKit,
); );
PREBINDING = NO;
PRODUCT_NAME = MeshViewer; PRODUCT_NAME = MeshViewer;
SDKROOT = ""; SDKROOT = "";
SEPARATE_STRIP = YES; SEPARATE_STRIP = YES;
...@@ -6873,11 +6853,11 @@ ...@@ -6873,11 +6853,11 @@
B81CFFBB097FE5F80057C06F /* Debug */ = { B81CFFBB097FE5F80057C06F /* Debug */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
DSTROOT = ../../../bin/MacOSX; DSTROOT = ../../../bin/MacOSX;
GCC_DYNAMIC_NO_PIC = NO; GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_MODEL_TUNING = G5; GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0; GCC_OPTIMIZATION_LEVEL = 0;
...@@ -6891,7 +6871,6 @@ ...@@ -6891,7 +6871,6 @@
"-framework", "-framework",
AppKit, AppKit,
); );
PREBINDING = NO;
PRODUCT_NAME = RenderToTexture_dbg; PRODUCT_NAME = RenderToTexture_dbg;
WRAPPER_EXTENSION = app; WRAPPER_EXTENSION = app;
ZERO_LINK = YES; ZERO_LINK = YES;
...@@ -6901,12 +6880,12 @@ ...@@ -6901,12 +6880,12 @@
B81CFFBC097FE5F80057C06F /* Release */ = { B81CFFBC097FE5F80057C06F /* Release */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES; COPY_PHASE_STRIP = YES;
DEAD_CODE_STRIPPING = YES; DEAD_CODE_STRIPPING = YES;
DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
DEPLOYMENT_POSTPROCESSING = YES; DEPLOYMENT_POSTPROCESSING = YES;
DSTROOT = ../../../bin/MacOSX; DSTROOT = ../../../bin/MacOSX;
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_MODEL_TUNING = G5; GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PRECOMPILE_PREFIX_HEADER = NO;
...@@ -6920,7 +6899,6 @@ ...@@ -6920,7 +6899,6 @@
"-framework", "-framework",
AppKit, AppKit,
); );
PREBINDING = NO;
PRODUCT_NAME = RenderToTexture; PRODUCT_NAME = RenderToTexture;
SEPARATE_STRIP = YES; SEPARATE_STRIP = YES;
STRIP_INSTALLED_PRODUCT = YES; STRIP_INSTALLED_PRODUCT = YES;
...@@ -6932,6 +6910,7 @@ ...@@ -6932,6 +6910,7 @@
B81CFFE9097FE9C30057C06F /* Debug */ = { B81CFFE9097FE9C30057C06F /* Debug */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO; GCC_DYNAMIC_NO_PIC = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
...@@ -6943,8 +6922,8 @@ ...@@ -6943,8 +6922,8 @@
B81CFFEA097FE9C30057C06F /* Release */ = { B81CFFEA097FE9C30057C06F /* Release */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES; COPY_PHASE_STRIP = YES;
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
PRODUCT_NAME = ALL; PRODUCT_NAME = ALL;
ZERO_LINK = NO; ZERO_LINK = NO;
...@@ -6954,11 +6933,11 @@ ...@@ -6954,11 +6933,11 @@
B8DEF3610950229300FDEA7E /* Debug */ = { B8DEF3610950229300FDEA7E /* Debug */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
DSTROOT = ../../../bin/MacOSX; DSTROOT = ../../../bin/MacOSX;
GCC_DYNAMIC_NO_PIC = NO; GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_MODEL_TUNING = G5; GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0; GCC_OPTIMIZATION_LEVEL = 0;
...@@ -6972,7 +6951,6 @@ ...@@ -6972,7 +6951,6 @@
"-framework", "-framework",
AppKit, AppKit,
); );
PREBINDING = NO;
PRODUCT_NAME = Demo_dbg; PRODUCT_NAME = Demo_dbg;
WRAPPER_EXTENSION = app; WRAPPER_EXTENSION = app;
ZERO_LINK = YES; ZERO_LINK = YES;
...@@ -6982,12 +6960,12 @@ ...@@ -6982,12 +6960,12 @@
B8DEF3620950229300FDEA7E /* Release */ = { B8DEF3620950229300FDEA7E /* Release */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES; COPY_PHASE_STRIP = YES;
DEAD_CODE_STRIPPING = YES; DEAD_CODE_STRIPPING = YES;
DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
DEPLOYMENT_POSTPROCESSING = YES; DEPLOYMENT_POSTPROCESSING = YES;
DSTROOT = ../../../bin/MacOSX; DSTROOT = ../../../bin/MacOSX;
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_MODEL_TUNING = G5; GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PRECOMPILE_PREFIX_HEADER = NO;
...@@ -7001,7 +6979,6 @@ ...@@ -7001,7 +6979,6 @@
"-framework", "-framework",
AppKit, AppKit,
); );
PREBINDING = NO;
PRODUCT_NAME = Demo; PRODUCT_NAME = Demo;
SEPARATE_STRIP = YES; SEPARATE_STRIP = YES;
STRIP_INSTALLED_PRODUCT = YES; STRIP_INSTALLED_PRODUCT = YES;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment