Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-06-02 03:26:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a bug compiling with SDL 1.3

Browse Source
This commit is contained in:
spartanj@gmail.com
2012-03-24 18:35:41 -03:00
parent e811b70b74
commit 2ac3f5c2b4
5 changed files with 36 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
Makefile
View File

@@ -65,38 +65,39 @@ endif
ifeq ($(BACKEND_SDL),yes)
# First check for SDL2
SDLVERSION2 = $(shell type -P sdl2-config &>/dev/null && sdl2-config --version || echo "")
#SDLVERSION2 = $(shell type -P sdl2-config &>/dev/null && sdl2-config --version || echo "")
ifeq ($(SDLVERSION2),)
#ifeq ($(SDLVERSION2),)
# Then for SDL 1.2 or SDL 1.3
SDLVERSION = $(shell type -P sdl-config &>/dev/null && sdl-config --version || echo "")
#SDLVERSION = $(shell type -P sdl-config &>/dev/null && sdl-config --version || echo "")
ifeq ($(SDLVERSION),)
# Default 2.0.0
SDL_VERSION = 2.0.0
else
SDL_VERSION = $(SDLVERSION)
endif
else
SDL_VERSION = $(SDLVERSION2)
endif
# Then for SDL 1.2 or SDL 1.3
#SDLVERSION = $(shell type -P sdl-config &>/dev/null && sdl-config --version || echo "")
#ifeq ($(SDLVERSION),)
#SDLVERSION2 = $(shell type -P sdl2-config &>/dev/null && sdl2-config --version || echo "")
#ifeq ($(SDLVERSION2),)
#ifeq ($(SDLVERSION),)
# Default 2.0.0
#SDL_VERSION = 2.0.0
#else
#SDL_VERSION = $(SDLVERSION2)
#SDL_VERSION = $(SDLVERSION)
#endif
#else
#SDL_VERSION = $(SDLVERSION)
#SDL_VERSION = $(SDLVERSION2)
#endif
# First check for SDL 1.2 or SDL 1.3
SDLVERSION = $(shell type -P sdl-config &>/dev/null && sdl-config --version || echo "")
ifeq ($(SDLVERSION),)
# Then for SDL 2
SDLVERSION2 = $(shell type -P sdl2-config &>/dev/null && sdl2-config --version || echo "")
ifeq ($(SDLVERSION2),)
# Default 2.0.0
SDL_VERSION = 2.0.0
else
SDL_VERSION = $(SDLVERSION2)
endif
else
SDL_VERSION = $(SDLVERSION)
endif
# If version is 1.2.x
ifneq (,$(findstring 1.2,$(SDL_VERSION)))
ifeq ($(OS), darwin)

6
ee.lib.win.cbp
View File

@@ -41,7 +41,7 @@
<Add option="-std=gnu99 -fno-strict-aliasing -ffast-math -Wno-unknown-pragmas" />
<Add option="-DSTBI_FAILURE_USERMSG" />
<Add option="-DEE_NO_SNDFILE" />
<Add option="-DEE_SDL_VERSION_2" />
<Add option="-DEE_SDL_VERSION_1_3" />
<Add directory=".\src\helper\chipmunk" />
<Add directory=".\src\helper\zlib" />
<Add directory="C:\MinGW\include\freetype2" />
@@ -821,6 +821,10 @@
<Unit filename="src\ui\cuispinbox.hpp" />
<Unit filename="src\ui\cuisprite.cpp" />
<Unit filename="src\ui\cuisprite.hpp" />
<Unit filename="src\ui\cuitab.cpp" />
<Unit filename="src\ui\cuitab.hpp" />
<Unit filename="src\ui\cuitabwidget.cpp" />
<Unit filename="src\ui\cuitabwidget.hpp" />
<Unit filename="src\ui\cuitextbox.cpp" />
<Unit filename="src\ui\cuitextbox.hpp" />
<Unit filename="src\ui\cuitextedit.cpp" />

2
src/test/eetest.cpp
View File

@@ -65,7 +65,7 @@ void cEETest::Init() {
PAK = eeNew( cZip, () );
PAK->Open( MyPath + "data/ee.zip" );
mWindow = EE->CreateWindow( WindowSettings( mWidth, mHeight, BitColor, Style, "ee.png" ), ContextSettings( VSync, GLVer ) );
mWindow = EE->CreateWindow( WindowSettings( mWidth, mHeight, BitColor, Style, "ee.png" ), ContextSettings( VSync, GLVer, true, 0, 0 ) );
run = ( mWindow->Created() && PAK->IsOpen() );

4
src/window/backend/SDL2/cwindowsdl.cpp
View File

@@ -172,9 +172,9 @@ void cWindowSDL::CreatePlatform() {
}
void cWindowSDL::SetGLConfig() {
SDL_GL_SetAttribute( SDL_GL_DEPTH_SIZE , mWindow.ContextConfig.DepthBufferSize ); // Depth
if ( mWindow.ContextConfig.DepthBufferSize ) SDL_GL_SetAttribute( SDL_GL_DEPTH_SIZE , mWindow.ContextConfig.DepthBufferSize ); // Depth
SDL_GL_SetAttribute( SDL_GL_DOUBLEBUFFER, ( mWindow.ContextConfig.DoubleBuffering ? 1 : 0 ) ); // Double Buffering
SDL_GL_SetAttribute( SDL_GL_STENCIL_SIZE, mWindow.ContextConfig.StencilBufferSize );
if ( mWindow.ContextConfig.StencilBufferSize ) SDL_GL_SetAttribute( SDL_GL_STENCIL_SIZE, mWindow.ContextConfig.StencilBufferSize );
if ( mWindow.WindowConfig.BitsPerPixel == 16 ) {
SDL_GL_SetAttribute( SDL_GL_RED_SIZE , 4 );

6
src/window/backend/SDL2/cwindowsdl.hpp
View File

@@ -9,7 +9,11 @@
#include "../../cwindow.hpp"
#if EE_PLATFORM == EE_PLATFORM_WIN || EE_PLATFORM == EE_PLATFORM_MACOSX || defined( EE_X11_PLATFORM )
#include <SDL2/SDL_syswm.h>
#if defined( EE_SDL_VERSION_1_3 )
#include <SDL/SDL_syswm.h>
#else
#include <SDL2/SDL_syswm.h>
#endif
#endif
namespace EE { namespace Window { namespace Backend { namespace SDL2 {