From 478289140daae28cf7eabf54af3addf476aaad9c Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Sat, 23 Aug 2014 21:00:08 -0300 Subject: Replace GLEW with a glLoadGen loader. This should fix the GL loading errors that occur in some drivers due to the use of deprecated functions by GLEW. Side benefits are more accurate auto-completion (deprecated function and symbols don't exist) and faster pointer loading (less entrypoints to load). In addition it removes an external library depency, simplifying the build system a bit and eliminating one set of binary libraries for Windows. --- src/citra/CMakeLists.txt | 4 ++-- src/citra/emu_window/emu_window_glfw.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'src/citra') diff --git a/src/citra/CMakeLists.txt b/src/citra/CMakeLists.txt index 1cbe22cc0..bd6c4a1a8 100644 --- a/src/citra/CMakeLists.txt +++ b/src/citra/CMakeLists.txt @@ -10,9 +10,9 @@ endif() 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}) + target_link_libraries(citra core common video_core iconv pthread ${COREFOUNDATION_LIBRARY} ${OPENGL_LIBRARIES} ${GLFW_LIBRARIES}) else() - 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} ${PNG_LIBRARIES}) + target_link_libraries(citra core common video_core pthread X11 Xxf86vm Xi Xcursor ${OPENGL_LIBRARIES} ${GLFW_LIBRARIES} rt ${X11_Xrandr_LIB} ${X11_xv86vmode_LIB} ${PNG_LIBRARIES}) endif() #install(TARGETS citra RUNTIME DESTINATION ${bindir}) diff --git a/src/citra/emu_window/emu_window_glfw.h b/src/citra/emu_window/emu_window_glfw.h index 5898ec177..c1b41203b 100644 --- a/src/citra/emu_window/emu_window_glfw.h +++ b/src/citra/emu_window/emu_window_glfw.h @@ -4,7 +4,6 @@ #pragma once -#include #include #include "common/emu_window.h" -- cgit v1.2.3 From 45976da975a21359cfcc9a05c575ed8b07575612 Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Sat, 23 Aug 2014 22:22:05 -0300 Subject: CMake cleanup Several cleanups to the buildsystem: - Do better factoring of common libs between platforms. - Add support to building on Windows. - Remove Qt4 support. - Re-sort file lists and add missing headers. --- src/citra/CMakeLists.txt | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) (limited to 'src/citra') diff --git a/src/citra/CMakeLists.txt b/src/citra/CMakeLists.txt index bd6c4a1a8..f10f3e603 100644 --- a/src/citra/CMakeLists.txt +++ b/src/citra/CMakeLists.txt @@ -1,6 +1,13 @@ -set(SRCS citra.cpp - emu_window/emu_window_glfw.cpp) -set(HEADERS resource.h) +set(SRCS + emu_window/emu_window_glfw.cpp + citra.cpp + ) +set(HEADERS + emu_window/emu_window_glfw.h + resource.h + ) + +create_directory_groups(${SRCS} ${HEADERS}) # NOTE: This is a workaround for CMake bug 0006976 (missing X11_xf86vmode_LIB variable) if (NOT X11_xf86vmode_LIB) @@ -8,11 +15,16 @@ if (NOT X11_xf86vmode_LIB) endif() add_executable(citra ${SRCS} ${HEADERS}) +target_link_libraries(citra core common video_core) +target_link_libraries(citra ${OPENGL_gl_LIBRARY} ${GLFW_LIBRARIES}) if (APPLE) - target_link_libraries(citra core common video_core iconv pthread ${COREFOUNDATION_LIBRARY} ${OPENGL_LIBRARIES} ${GLFW_LIBRARIES}) -else() - target_link_libraries(citra core common video_core pthread X11 Xxf86vm Xi Xcursor ${OPENGL_LIBRARIES} ${GLFW_LIBRARIES} rt ${X11_Xrandr_LIB} ${X11_xv86vmode_LIB} ${PNG_LIBRARIES}) + target_link_libraries(citra iconv pthread ${COREFOUNDATION_LIBRARY}) +elseif (WIN32) + target_link_libraries(citra winmm) +else() # Unix + target_link_libraries(citra pthread rt) + target_link_libraries(citra ${X11_X11_LIB} ${X11_Xi_LIB} ${X11_Xcursor_LIB} ${X11_Xrandr_LIB} ${X11_xv86vmode_LIB}) endif() #install(TARGETS citra RUNTIME DESTINATION ${bindir}) -- cgit v1.2.3 From c57de3e4046c662c5179d3b55340361a046a57ff Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Mon, 1 Sep 2014 18:04:07 -0300 Subject: Remove hand-crafted Visual Studio solution. --- src/citra/citra.vcxproj | 215 ---------------------------------------- src/citra/citra.vcxproj.filters | 23 ----- 2 files changed, 238 deletions(-) delete mode 100644 src/citra/citra.vcxproj delete mode 100644 src/citra/citra.vcxproj.filters (limited to 'src/citra') diff --git a/src/citra/citra.vcxproj b/src/citra/citra.vcxproj deleted file mode 100644 index bda1ed07d..000000000 --- a/src/citra/citra.vcxproj +++ /dev/null @@ -1,215 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {CE7D2C07-21CE-4590-81AB-2ADA88A2B85F} - Win32Proj - emu_win32 - citra - - - - Application - true - v120 - - - Application - true - v120 - - - Application - false - v120 - - - Application - false - v120 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - msvcrtd.lib;msvcrt.lib - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - libcmt.lib - - - - - - - - - - - - - - - - - - {dfe335fc-755d-4baa-8452-94434f8a1edb} - true - true - false - true - false - - - {8aea7f29-3466-4786-a10d-6a4bd0610977} - true - true - false - true - false - - - {6678d1a3-33a6-48a9-878b-48e5d2903d27} - - - - - - - - - - - - - - - - - diff --git a/src/citra/citra.vcxproj.filters b/src/citra/citra.vcxproj.filters deleted file mode 100644 index 78954670e..000000000 --- a/src/citra/citra.vcxproj.filters +++ /dev/null @@ -1,23 +0,0 @@ - - - - - {e3161526-9f53-4670-8dae-2be81ff01bc2} - - - - - - emu_window - - - - - - emu_window - - - - - - -- cgit v1.2.3