mirror of
https://github.com/Lime3DS/Lime3DS.git
synced 2024-11-01 16:05:07 +01:00
CMakeLists: rename HEADS, improved comments
Changes for clarity of comments, removed redundant compiler flags.
This commit is contained in:
parent
71b8789803
commit
403e4bf837
@ -3,8 +3,6 @@ cmake_minimum_required(VERSION 2.6)
|
||||
project(citra)
|
||||
|
||||
SET(CMAKE_CXX_FLAGS "-std=c++11 -fpermissive")
|
||||
SET(CMAKE_CXX_FLAGS_DEBUG "-std=c++11 -fpermissive")
|
||||
SET(CMAKE_CXX_FLAGS_RELEASE "-std=c++11 -fpermissive")
|
||||
|
||||
# silence some spam
|
||||
add_definitions(-Wno-attributes)
|
||||
@ -20,6 +18,7 @@ find_package(GLEW REQUIRED)
|
||||
find_package(OpenGL REQUIRED)
|
||||
pkg_search_module(GLFW REQUIRED glfw3)
|
||||
|
||||
# corefoundation is required only on OSX
|
||||
IF (APPLE)
|
||||
FIND_LIBRARY(COREFOUNDATION_LIBRARY CoreFoundation)
|
||||
SET(CMAKE_CXX_FLAGS "-stdlib=libc++")
|
||||
@ -31,7 +30,7 @@ include_directories(${GLFW_INCLUDE_DIRS})
|
||||
include_directories(${OPENGL_INCLUDE_DIR})
|
||||
include_directories(${GLEW_INCLUDE_DIR})
|
||||
|
||||
#use pkg_search_module library dirs
|
||||
# workaround for GLFW linking on OSX
|
||||
link_directories(${GLFW_LIBRARY_DIRS})
|
||||
|
||||
option(DISABLE_QT4 "Disable Qt4 GUI" OFF)
|
||||
|
@ -1,6 +1,6 @@
|
||||
set(SRCS citra.cpp
|
||||
emu_window/emu_window_glfw.cpp)
|
||||
set(HEADS citra.h
|
||||
set(HEADERS citra.h
|
||||
resource.h)
|
||||
|
||||
# NOTE: This is a workaround for CMake bug 0006976 (missing X11_xf86vmode_LIB variable)
|
||||
@ -8,7 +8,7 @@ if (NOT X11_xf86vmode_LIB)
|
||||
set(X11_xv86vmode_LIB Xxf86vm)
|
||||
endif()
|
||||
|
||||
add_executable(citra ${SRCS} ${HEADS})
|
||||
add_executable(citra ${SRCS} ${HEADERS})
|
||||
|
||||
if (APPLE)
|
||||
target_link_libraries(citra core common video_core iconv pthread ${COREFOUNDATION_LIBRARY} ${OPENGL_LIBRARIES} ${GLEW_LIBRARY} ${GLFW_LIBRARIES})
|
||||
|
@ -8,7 +8,7 @@ set(SRCS
|
||||
main.cpp
|
||||
config/controller_config.cpp
|
||||
config/controller_config_util.cpp)
|
||||
set (HEADS
|
||||
set (HEADERS
|
||||
bootmanager.hxx
|
||||
debugger/callstack.hxx
|
||||
debugger/disassembler.hxx
|
||||
@ -49,7 +49,7 @@ qt4_wrap_cpp(MOC_SRCS
|
||||
include_directories(${CMAKE_CURRENT_BINARY_DIR})
|
||||
include_directories(./)
|
||||
|
||||
add_executable(citra-qt ${SRCS} ${HEADS} ${MOC_SRCS} ${UI_HDRS})
|
||||
add_executable(citra-qt ${SRCS} ${HEADERS} ${MOC_SRCS} ${UI_HDRS})
|
||||
if (APPLE)
|
||||
target_link_libraries(citra-qt core common video_core qhexedit iconv ${COREFOUNDATION_LIBRARY} ${QT_LIBRARIES} ${GLEW_LIBRARY} ${OPENGL_LIBRARIES})
|
||||
else()
|
||||
|
@ -19,7 +19,7 @@ set(SRCS break_points.cpp
|
||||
timer.cpp
|
||||
utf8.cpp)
|
||||
|
||||
set(HEADS atomic.h
|
||||
set(HEADERS atomic.h
|
||||
atomic_gcc.h
|
||||
atomic_win32.h
|
||||
bit_field.h
|
||||
@ -58,4 +58,4 @@ set(HEADS atomic.h
|
||||
timer.h
|
||||
utf8.h)
|
||||
|
||||
add_library(common STATIC ${SRCS} ${HEADS})
|
||||
add_library(common STATIC ${SRCS} ${HEADERS})
|
||||
|
@ -43,7 +43,7 @@ set(SRCS core.cpp
|
||||
hw/lcd.cpp
|
||||
hw/ndma.cpp)
|
||||
|
||||
set(HEADS core.h
|
||||
set(HEADERS core.h
|
||||
core_timing.h
|
||||
loader.h
|
||||
mem_map.h
|
||||
@ -86,4 +86,4 @@ set(HEADS core.h
|
||||
hw/lcd.h
|
||||
hw/ndma.h)
|
||||
|
||||
add_library(core STATIC ${SRCS} ${HEADS})
|
||||
add_library(core STATIC ${SRCS} ${HEADERS})
|
||||
|
@ -2,9 +2,9 @@ set(SRCS video_core.cpp
|
||||
utils.cpp
|
||||
renderer_opengl/renderer_opengl.cpp)
|
||||
|
||||
set(HEADS video_core.h
|
||||
set(HEADERS video_core.h
|
||||
utils.h
|
||||
renderer_base.h
|
||||
renderer_opengl/renderer_opengl.h)
|
||||
|
||||
add_library(video_core STATIC ${SRCS} ${HEADS})
|
||||
add_library(video_core STATIC ${SRCS} ${HEADERS})
|
||||
|
Loading…
Reference in New Issue
Block a user