The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-24 23:11:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix ARM building.

Browse Source
This commit is contained in:
Ryan Houdek 2013-03-31 04:32:13 +00:00
parent c5a0104147
commit 1dd1ebb8bd
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -114,6 +114,8 @@ if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^arm")
add_definitions(-marm -march=armv7-a) add_definitions(-marm -march=armv7-a)
add_definitions(-D_M_ARM=1) add_definitions(-D_M_ARM=1)
add_definitions(-D_M_GENERIC=1) add_definitions(-D_M_GENERIC=1)
# Set generic options so you don't have to pass anything to cmake to build ARM
set(USE_GLES 1)
endif() endif()
# Set these next two lines to test generic # Set these next two lines to test generic

5
Source/Plugins/Plugin_VideoSoftware/CMakeLists.txt
View File

@ -10,7 +10,6 @@ set(SRCS Src/BPMemLoader.cpp
Src/OpcodeDecoder.cpp Src/OpcodeDecoder.cpp
Src/SWPixelEngine.cpp Src/SWPixelEngine.cpp
Src/Rasterizer.cpp Src/Rasterizer.cpp
Src/RasterFont.cpp
Src/SWRenderer.cpp Src/SWRenderer.cpp
Src/SetupUnit.cpp Src/SetupUnit.cpp
Src/SWStatistics.cpp Src/SWStatistics.cpp
@ -37,11 +36,11 @@ if(USE_EGL)
endif() endif()
if(USE_GLES) if(USE_GLES)
set(SRCS ${SRCS} set(SRCS ${SRCS} ../Plugin_VideoOGL/Src/GLUtil.cpp)
../Plugin_VideoOGL/Src/GLUtil.cpp)
set(LIBS ${LIBS} set(LIBS ${LIBS}
GLESv2) GLESv2)
else() else()
set(SRCS ${SRCS} Src/RasterFont.cpp)
set(LIBS ${LIBS} set(LIBS ${LIBS}
GLEW GLEW
${OPENGL_LIBRARIES}) ${OPENGL_LIBRARIES})