Merge branch 'GLES-software'

This commit is contained in:
Ryan Houdek committed 2012-12-26 12:54:58 -06:00
commit 67c1c6b062
36 files changed
+1962 -911

No files matched your search

+5 -1
View File
@@ -192,7 +192,11 @@ set(SRCS Src/ActionReplay.cpp
Src/PowerPC/JitCommon/JitCache.cpp
Src/PowerPC/JitCommon/Jit_Util.cpp)
set(LIBS bdisasm inputcommon videoogl videosoftware sfml-network)
set(LIBS bdisasm inputcommon videosoftware sfml-network)
if(NOT USE_GLES)
set(LIBS ${LIBS} videoogl)
endif()
if(WIN32)
set(SRCS ${SRCS} Src/HW/BBA-TAP/TAP_Win32.cpp Src/stdafx.cpp