Merge revision 4824:4854 from trunk to ogl-es (catched up to trunk):
- Fix dependencies for example 30 - minor stuff git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4855 dfc29bdd-3216-0410-991c-e03cc46cb475master
parent
305eabda93
commit
07d70d8058
|
@ -144,7 +144,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "25.XmlHandling", "25.XmlHan
|
||||||
{E08E042A-6C45-411B-92BE-3CC31331019F} = {E08E042A-6C45-411B-92BE-3CC31331019F}
|
{E08E042A-6C45-411B-92BE-3CC31331019F} = {E08E042A-6C45-411B-92BE-3CC31331019F}
|
||||||
EndProjectSection
|
EndProjectSection
|
||||||
EndProject
|
EndProject
|
||||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "24.CursorControl", "30.Profiling\Profiling_vc11.vcxproj", "{65D9DE2E-B73E-4ADF-96D1-BF4A8B7F4F97}"
|
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "30.Profiling", "30.Profiling\Profiling_vc11.vcxproj", "{65D9DE2E-B73E-4ADF-96D1-BF4A8B7F4F97}"
|
||||||
|
ProjectSection(ProjectDependencies) = postProject
|
||||||
|
{E08E042A-6C45-411B-92BE-3CC31331019F} = {E08E042A-6C45-411B-92BE-3CC31331019F}
|
||||||
|
EndProjectSection
|
||||||
EndProject
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
|
|
|
@ -37,7 +37,7 @@ CDemo::~CDemo()
|
||||||
|
|
||||||
void CDemo::run()
|
void CDemo::run()
|
||||||
{
|
{
|
||||||
core::dimension2d<u32> resolution ( 800, 600 );
|
core::dimension2d<u32> resolution (800, 600);
|
||||||
|
|
||||||
if ( driverType == video::EDT_BURNINGSVIDEO || driverType == video::EDT_SOFTWARE )
|
if ( driverType == video::EDT_BURNINGSVIDEO || driverType == video::EDT_SOFTWARE )
|
||||||
{
|
{
|
||||||
|
@ -52,7 +52,7 @@ void CDemo::run()
|
||||||
params.Fullscreen=fullscreen;
|
params.Fullscreen=fullscreen;
|
||||||
params.Stencilbuffer=shadows;
|
params.Stencilbuffer=shadows;
|
||||||
params.Vsync=vsync;
|
params.Vsync=vsync;
|
||||||
params.AntiAlias=aa;
|
params.AntiAlias=aa?8:0;
|
||||||
params.EventReceiver=this;
|
params.EventReceiver=this;
|
||||||
|
|
||||||
device = createDeviceEx(params);
|
device = createDeviceEx(params);
|
||||||
|
|
|
@ -15,14 +15,6 @@
|
||||||
#undef NEED_SHORT_EXTERNAL_NAMES
|
#undef NEED_SHORT_EXTERNAL_NAMES
|
||||||
#undef INCOMPLETE_TYPES_BROKEN
|
#undef INCOMPLETE_TYPES_BROKEN
|
||||||
|
|
||||||
#ifdef _MSC_VER
|
|
||||||
/* Define "boolean" as unsigned char, not int, per Windows custom */
|
|
||||||
#ifndef __RPCNDR_H__ /* don't conflict if rpcndr.h already read */
|
|
||||||
typedef unsigned char boolean;
|
|
||||||
#endif
|
|
||||||
#define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef JPEG_INTERNALS
|
#ifdef JPEG_INTERNALS
|
||||||
|
|
||||||
#undef RIGHT_SHIFT_IS_UNSIGNED
|
#undef RIGHT_SHIFT_IS_UNSIGNED
|
||||||
|
|
Loading…
Reference in New Issue