Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-08-11 01:01:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Release Compilation.

Browse Source 
Removed some warnings.
This commit is contained in:
spartanj
2010-10-14 03:12:43 -03:00
parent 4f1548c135
commit cb59a5275a
6 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ee.linux.cbp
View File

@@ -14,6 +14,7 @@
<Compiler>
<Add option="-g" />
<Add option="-DEE_DEBUG" />
<Add option="-DEE_MEMORY_MANAGER" />
</Compiler>
</Target>
<Target title="Release">
@@ -31,7 +32,6 @@
</Build>
<Compiler>
<Add option="-Wall" />
<Add option="-DEE_MEMORY_MANAGER" />
</Compiler>
<Linker>
<Add library="GL" />
@@ -536,6 +536,8 @@
<Unit filename="src/ui/cuiskincomplex.hpp" />
<Unit filename="src/ui/cuiskinsimple.cpp" />
<Unit filename="src/ui/cuiskinsimple.hpp" />
<Unit filename="src/ui/cuiskinstate.cpp" />
<Unit filename="src/ui/cuiskinstate.hpp" />
<Unit filename="src/ui/cuislider.cpp" />
<Unit filename="src/ui/cuislider.hpp" />
<Unit filename="src/ui/cuisliderbutton.cpp" />

6
src/base.hpp
View File

@@ -56,6 +56,12 @@
#define EE_COMPILER_GCC
#endif
#ifndef EE_DEBUG
#if defined( DEBUG ) || defined( _DEBUG ) || defined( __DEBUG )
#define EE_DEBUG
#endif
#endif
#if defined(__x86_64__) || \
(defined(_WIN64) && !defined(_XBOX)) || \
defined(__64BIT__) || defined(__LP64) || defined(__LP64__) || defined(_LP64) || defined(_ADDR64) || defined(_CRAYC) || defined(__arch64__) || \

4
src/base/debug.cpp
View File

@@ -2,6 +2,8 @@
namespace EE {
#ifdef EE_DEBUG
void eeREPORT_ASSERT( const char * File, int Line, const char * Exp ) {
#ifdef EE_COMPILER_MSVC
@@ -67,4 +69,6 @@ void eePRINTC( unsigned int cond, const char * format, ...) {
#endif
}
#endif
}

6
src/base/debug.hpp
View File

@@ -19,8 +19,14 @@ void eePRINTC ( unsigned int cond, const char * format, ... );
#define eeASSERT( expr )
#define eeASSERTM( expr, msg )
#ifdef EE_COMPILER_GCC
#define eePRINT( format, args... ) {}
#define eePRINTC( cond, format, args... ) {}
#else
#define eePRINT
#define eePRINTC
#endif
#endif

8
src/helper/SOIL/SOIL.c
View File

@@ -2015,8 +2015,12 @@ int query_DXT_capability( void )
CFRelease( extensionName );
CFRelease( bundle );
#else
ext_addr = (P_SOIL_GLCOMPRESSEDTEXIMAGE2DPROC)
glXGetProcAddressARB
ext_addr = (P_SOIL_GLCOMPRESSEDTEXIMAGE2DPROC)
#if !defined(GLX_VERSION_1_4)
glXGetProcAddressARB
#else
glXGetProcAddress
#endif
(
(const GLubyte *)"glCompressedTexImage2DARB"
);

10
src/test/ee.cpp
View File

@@ -482,23 +482,23 @@ void cEETest::CreateUI() {
mSlider = eeNew( cUISlider, ( SliderParams ) );
mSlider->Visible( true );
mSlider->Enabled( true );
SliderParams.PosSet( 60, 120 );
mSlider = eeNew( cUISlider, ( SliderParams ) );
mSlider->Visible( true );
mSlider->Enabled( true );
cUISpinBox::CreateParams SpinBoxParams;
SpinBoxParams.Parent( C );
SpinBoxParams.PosSet( 80, 150 );
SpinBoxParams.Size = eeSize( 80, 23 );
SpinBoxParams.Size = eeSize( 80, 24 );
SpinBoxParams.Flags = UI_VALIGN_CENTER | UI_HALIGN_LEFT | UI_CLIP_ENABLE;
SpinBoxParams.Font = TTF;
SpinBoxParams.AllowDotsInNumbers = true;
cUISpinBox * mSpinBox = eeNew( cUISpinBox, ( SpinBoxParams ) );
mSpinBox->Visible( true );
mSpinBox->Enabled( true );
mSpinBox->Padding( eeRectf( 2, 0, -2, 0 ) );
mSpinBox->Padding( eeRectf( 3, -1, 0, 0 ) );
cUIScrollBar::CreateParams ScrollBarP;
ScrollBarP.Parent( C );
@@ -510,7 +510,7 @@ void cEETest::CreateUI() {
mScrollBar->Visible( true );
mScrollBar->Enabled( true );
mScrollBar->AddEventListener( cUIEvent::EventOnValueChange, cb::Make1( this, &cEETest::OnValueChange ) );
TextParams.PosSet( 20, 5 );
mTextBoxValue = eeNew( cUITextBox, ( TextParams ) );
mTextBoxValue->Visible( true );