OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-15 04:10:07 +00:00
Code Issues Projects Releases Wiki Activity

Some more experimentation

Browse Source
This commit is contained in:
archshift 2014-04-29 19:27:01 -07:00
parent 237d079aad
commit 52377cf0d2
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 2.6)
project(citra) project(citra)
SET(CMAKE_CXX_FLAGS "-std=c++11 -fpermissive")
SET(CMAKE_CXX_FLAGS_DEBUG "-std=c++11 -fpermissive") SET(CMAKE_CXX_FLAGS_DEBUG "-std=c++11 -fpermissive")
SET(CMAKE_CXX_FLAGS_RELEASE "-std=c++11 -fpermissive") SET(CMAKE_CXX_FLAGS_RELEASE "-std=c++11 -fpermissive")
@ -19,7 +20,10 @@ find_package(OpenGL REQUIRED)
pkg_search_module(GLFW REQUIRED glfw3) pkg_search_module(GLFW REQUIRED glfw3)
IF (APPLE) IF (APPLE)
FIND_LIBRARY(COREFOUNDATION_LIBRARY CoreFoundation) FIND_LIBRARY(COREFOUNDATION_LIBRARY CoreFoundation)
SET(CMAKE_CXX_FLAGS "-stdlib=libc++")
SET(CMAKE_CXX_FLAGS_DEBUG "-stdlib=libc++")
SET(CMAKE_CXX_FLAGS_RELEASE "-stdlib=libc++")
ENDIF (APPLE) ENDIF (APPLE)
include_directories(${GLFW_INCLUDE_DIRS}) include_directories(${GLFW_INCLUDE_DIRS})

2
src/citra/CMakeLists.txt
View File

@ -9,6 +9,6 @@ if (NOT X11_xf86vmode_LIB)
endif() endif()
add_executable(citra ${SRCS} ${HEADS}) add_executable(citra ${SRCS} ${HEADS})
target_link_libraries(citra core common video_core GLEW pthread X11 Xxf86vm Xi Xcursor ${OPENGL_LIBRARIES} ${GLFW_LIBRARIES} rt ${X11_Xrandr_LIB} ${X11_xv86vmode_LIB}) target_link_libraries(citra core common video_core iconv pthread ${COREFOUNDATION_LIBRARY} ${OPENGL_LIBRARIES} ${GLEW_LIBRARY} ${GLFW_LIBRARIES})
#install(TARGETS citra RUNTIME DESTINATION ${bindir}) #install(TARGETS citra RUNTIME DESTINATION ${bindir})

6
src/common/common.h
View File

@ -21,11 +21,11 @@
#define STACKALIGN #define STACKALIGN
#if __cplusplus >= 201103 || defined(_MSC_VER) || defined(__GXX_EXPERIMENTAL_CXX0X__) #if __cplusplus >= 201103L || defined(_MSC_VER) || defined(__GXX_EXPERIMENTAL_CXX0X__)
#define HAVE_CXX11_SYNTAX 1 #define HAVE_CXX11_SYNTAX 1
#endif #endif
#if HAVE_CXX11_SYNTAX //#if HAVE_CXX11_SYNTAX
// An inheritable class to disallow the copy constructor and operator= functions // An inheritable class to disallow the copy constructor and operator= functions
class NonCopyable class NonCopyable
{ {
@ -37,7 +37,7 @@ private:
NonCopyable(NonCopyable&); NonCopyable(NonCopyable&);
NonCopyable& operator=(NonCopyable& other); NonCopyable& operator=(NonCopyable& other);
}; };
#endif //#endif
#include "common/log.h" #include "common/log.h"
#include "common/common_types.h" #include "common/common_types.h"