mirror of
https://github.com/RetroDECK/ES-DE.git
synced 2024-11-22 06:05:38 +00:00
Check for g++, not gcc and fix linking on Raspberry Pi
We actually need g++, not gcc. Also on the Pi the OpenGLES libs where missing.
This commit is contained in:
parent
30f5bf0dcf
commit
c1c52e844a
|
@ -57,10 +57,10 @@ if(MSVC)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(CMAKE_COMPILER_IS_GNUCXX)
|
if(CMAKE_COMPILER_IS_GNUCXX)
|
||||||
#check for GCC 4.7+
|
#check for G++ 4.7+
|
||||||
execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
|
execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE G++_VERSION)
|
||||||
if (GCC_VERSION VERSION_LESS 4.7)
|
if (G++_VERSION VERSION_LESS 4.7)
|
||||||
message(SEND_ERROR "You need at least GCC 4.7 to compile EmulationStation!")
|
message(SEND_ERROR "You need at least G++ 4.7 to compile EmulationStation!")
|
||||||
endif()
|
endif()
|
||||||
#set up compiler flags for GCC
|
#set up compiler flags for GCC
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O2") #support C++11 for std::, optimize
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O2") #support C++11 for std::, optimize
|
||||||
|
@ -230,6 +230,7 @@ if(DEFINED BCMHOST)
|
||||||
LIST(APPEND ES_LIBRARIES
|
LIST(APPEND ES_LIBRARIES
|
||||||
bcm_host
|
bcm_host
|
||||||
EGL
|
EGL
|
||||||
|
${OPENGLES_LIBRARIES}
|
||||||
)
|
)
|
||||||
else()
|
else()
|
||||||
if(MSVC)
|
if(MSVC)
|
||||||
|
|
Loading…
Reference in a new issue