Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-26 08:05:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed Raspberry Pi Makefile.

Browse source 
Fixed a reorder warning in InputManager.cpp.
This commit is contained in:
Aloshi 2013-05-16 19:13:49 -05:00
parent 75d0226aa5
commit c5e91da629
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Makefile
View file

@ -1,5 +1,8 @@
CPPFLAGS=-I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux -I/usr/include/freetype2 -I/usr/include/SDL -D_RPI_ CPPFLAGS=-I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux -I/usr/include/freetype2 -I/usr/include/SDL -std=c++0x
CPPFLAGS+=-DUSE_OPENGL_ES -D_RPI_
LIBS=-L/opt/vc/lib -lbcm_host -lEGL -lGLESv2 -lfreetype -lSDL -lboost_system -lboost_filesystem -lfreeimage -lSDL_mixer LIBS=-L/opt/vc/lib -lbcm_host -lEGL -lGLESv2 -lfreetype -lSDL -lboost_system -lboost_filesystem -lfreeimage -lSDL_mixer
ADDITIONAL_SRC_SOURCES=Renderer_init_rpi.cpp ADDITIONAL_SRC_SOURCES=Renderer_init_rpi.cpp
FT_FREETYPE_H_PATH=/usr/include/freetype
include Makefile.common include Makefile.common

4
src/InputManager.cpp
View file

@ -9,8 +9,8 @@
namespace fs = boost::filesystem; namespace fs = boost::filesystem;
InputManager::InputManager(Window* window) : mWindow(window), InputManager::InputManager(Window* window) : mWindow(window),
mJoysticks(NULL), mInputConfigs(NULL), mKeyboardInputConfig(NULL), mPrevAxisValues(NULL), mNumJoysticks(0), mNumPlayers(0), mJoysticks(NULL),
mNumJoysticks(0), mNumPlayers(0) mInputConfigs(NULL), mKeyboardInputConfig(NULL), mPrevAxisValues(NULL)
{ {
} }