mirror of
https://github.com/RetroDECK/ES-DE.git
synced 2024-11-22 14:15:38 +00:00
Fixed Raspberry Pi Makefile.
Fixed a reorder warning in InputManager.cpp.
This commit is contained in:
parent
75d0226aa5
commit
c5e91da629
5
Makefile
5
Makefile
|
@ -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
|
||||
|
||||
ADDITIONAL_SRC_SOURCES=Renderer_init_rpi.cpp
|
||||
FT_FREETYPE_H_PATH=/usr/include/freetype
|
||||
|
||||
include Makefile.common
|
||||
|
|
|
@ -9,8 +9,8 @@
|
|||
namespace fs = boost::filesystem;
|
||||
|
||||
InputManager::InputManager(Window* window) : mWindow(window),
|
||||
mJoysticks(NULL), mInputConfigs(NULL), mKeyboardInputConfig(NULL), mPrevAxisValues(NULL),
|
||||
mNumJoysticks(0), mNumPlayers(0)
|
||||
mNumJoysticks(0), mNumPlayers(0), mJoysticks(NULL),
|
||||
mInputConfigs(NULL), mKeyboardInputConfig(NULL), mPrevAxisValues(NULL)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue