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_qt/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'src/citra_qt')
diff --git a/src/citra_qt/CMakeLists.txt b/src/citra_qt/CMakeLists.txt
index 8ad6759b7..055a585a0 100644
--- a/src/citra_qt/CMakeLists.txt
+++ b/src/citra_qt/CMakeLists.txt
@@ -47,7 +47,7 @@ else()
set(RT_LIBRARY rt)
endif()
-target_link_libraries(citra-qt core common video_core qhexedit ${ICONV_LIBRARY} ${COREFOUNDATION_LIBRARY} ${QT_LIBRARIES} ${OPENGL_LIBRARIES} ${RT_LIBRARY} ${GLEW_LIBRARY} ${PNG_LIBRARIES})
+target_link_libraries(citra-qt core common video_core qhexedit ${ICONV_LIBRARY} ${COREFOUNDATION_LIBRARY} ${QT_LIBRARIES} ${OPENGL_LIBRARIES} ${RT_LIBRARY} ${PNG_LIBRARIES})
if(USE_QT5)
target_link_libraries(citra-qt Qt5::Gui Qt5::Widgets Qt5::OpenGL)
endif()
--
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_qt/CMakeLists.txt | 39 +++++++++++++++++++++++----------------
1 file changed, 23 insertions(+), 16 deletions(-)
(limited to 'src/citra_qt')
diff --git a/src/citra_qt/CMakeLists.txt b/src/citra_qt/CMakeLists.txt
index 055a585a0..426e4ef99 100644
--- a/src/citra_qt/CMakeLists.txt
+++ b/src/citra_qt/CMakeLists.txt
@@ -2,54 +2,61 @@ set(CMAKE_AUTOMOC ON)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(SRCS
- bootmanager.cpp
+ config/controller_config.cpp
+ config/controller_config_util.cpp
debugger/callstack.cpp
debugger/disassembler.cpp
debugger/graphics.cpp
debugger/graphics_cmdlists.cpp
debugger/ramview.cpp
debugger/registers.cpp
+ bootmanager.cpp
hotkeys.cpp
main.cpp
- config/controller_config.cpp
- config/controller_config_util.cpp)
+ )
set(HEADERS
- bootmanager.hxx
+ config/controller_config.hxx
+ config/controller_config_util.hxx
debugger/callstack.hxx
debugger/disassembler.hxx
+ debugger/graphics.hxx
+ debugger/graphics_cmdlists.hxx
debugger/ramview.hxx
debugger/registers.hxx
+ bootmanager.hxx
hotkeys.hxx
main.hxx
version.h
- config/controller_config.hxx
- config/controller_config_util.hxx)
+ )
set(UIS
+ config/controller_config.ui
debugger/callstack.ui
debugger/disassembler.ui
debugger/registers.ui
hotkeys.ui
main.ui
- config/controller_config.ui)
+ )
+
+create_directory_groups(${SRCS} ${HEADERS} ${UIS})
-if(USE_QT5)
+if (Qt5_FOUND)
qt5_wrap_ui(UI_HDRS ${UIS})
else()
qt4_wrap_ui(UI_HDRS ${UIS})
endif()
add_executable(citra-qt ${SRCS} ${HEADERS} ${UI_HDRS})
-if(APPLE)
- set(ICONV_LIBRARY iconv)
-else()
- set(RT_LIBRARY rt)
-endif()
+target_link_libraries(citra-qt core common video_core qhexedit)
+target_link_libraries(citra-qt ${OPENGL_gl_LIBRARY} ${CITRA_QT_LIBS})
-target_link_libraries(citra-qt core common video_core qhexedit ${ICONV_LIBRARY} ${COREFOUNDATION_LIBRARY} ${QT_LIBRARIES} ${OPENGL_LIBRARIES} ${RT_LIBRARY} ${PNG_LIBRARIES})
-if(USE_QT5)
- target_link_libraries(citra-qt Qt5::Gui Qt5::Widgets Qt5::OpenGL)
+if (APPLE)
+ target_link_libraries(citra-qt iconv ${COREFOUNDATION_LIBRARY})
+elseif (WIN32)
+ target_link_libraries(citra-qt winmm)
+else() # Unix
+ target_link_libraries(citra-qt rt)
endif()
#install(TARGETS citra-qt 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_qt/citra_qt.vcxproj | 188 -------------
src/citra_qt/citra_qt.vcxproj.filters | 118 --------
src/citra_qt/qt-build.props | 61 -----
src/citra_qt/qt-build.targets | 247 -----------------
src/citra_qt/qt-build.xml | 491 ----------------------------------
5 files changed, 1105 deletions(-)
delete mode 100644 src/citra_qt/citra_qt.vcxproj
delete mode 100644 src/citra_qt/citra_qt.vcxproj.filters
delete mode 100644 src/citra_qt/qt-build.props
delete mode 100644 src/citra_qt/qt-build.targets
delete mode 100644 src/citra_qt/qt-build.xml
(limited to 'src/citra_qt')
diff --git a/src/citra_qt/citra_qt.vcxproj b/src/citra_qt/citra_qt.vcxproj
deleted file mode 100644
index 746c12a5b..000000000
--- a/src/citra_qt/citra_qt.vcxproj
+++ /dev/null
@@ -1,188 +0,0 @@
-
-
-
-
- Debug
- Win32
-
-
- Debug
- x64
-
-
- Release
- Win32
-
-
- Release
- x64
-
-
-
- {A587F714-490F-407A-9E36-7AB7FA0D7BAB}
- citra_qt
-
-
-
- Application
- true
- v120
-
-
- Application
- true
- v120
-
-
- Application
- false
- v120
-
-
- Application
- false
- v120
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {dfe335fc-755d-4baa-8452-94434f8a1edb}
-
-
- {8aea7f29-3466-4786-a10d-6a4bd0610977}
-
-
- {6678d1a3-33a6-48a9-878b-48e5d2903d27}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/citra_qt/citra_qt.vcxproj.filters b/src/citra_qt/citra_qt.vcxproj.filters
deleted file mode 100644
index 8f699e50e..000000000
--- a/src/citra_qt/citra_qt.vcxproj.filters
+++ /dev/null
@@ -1,118 +0,0 @@
-
-
-
-
- {dede739c-939b-4147-9e72-4a326b97d237}
-
-
- {80178741-d3ab-4031-892c-ec58490ea8bf}
-
-
- {9495d0e7-87d6-4fe1-92f1-cfa1bbec7025}
-
-
-
-
- qhexedit
-
-
- qhexedit
-
-
- qhexedit
-
-
- qhexedit
-
-
-
-
-
- config
-
-
- config
-
-
- debugger
-
-
- debugger
-
-
- debugger
-
-
- debugger
-
-
- debugger
-
-
- debugger
-
-
-
-
- qhexedit
-
-
- qhexedit
-
-
- qhexedit
-
-
- qhexedit
-
-
-
-
-
- debugger
-
-
- debugger
-
-
- debugger
-
-
- debugger
-
-
- debugger
-
-
- debugger
-
-
-
-
-
- config
-
-
- config
-
-
-
-
-
-
- config
-
-
- debugger
-
-
- debugger
-
-
- debugger
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/citra_qt/qt-build.props b/src/citra_qt/qt-build.props
deleted file mode 100644
index b6a5025fb..000000000
--- a/src/citra_qt/qt-build.props
+++ /dev/null
@@ -1,61 +0,0 @@
-
-
-
-
- Midl
- CustomBuild
-
-
-
- .hpp
- ui_
- $(QTDIR)\bin\uic.exe [inputs] -o "[QtUicPrefix]%(FileName)[QtUicExt]"
- [QtUicPrefix]%(FileName)[QtUicExt]
- %(FileName).ui
-
-
-
- Midl
- CustomBuild
-
-
-
- true
- true
- true
- true
- true
- true
- true
- true
- False
- False
- _moc
- %(FileName)%(QtMocPfx)
- $(QTDIR)\bin\moc.exe [QtMocNoWarnings] [QtCoreLib] [QtShared] [QtThread] [QtUnicode] [QtLargeFile] [QtKeywords] [QtOpenGLLib] [QtNoDebug] [QtGuiLib] -DWIN32 -D_MSC_VER=1500 -DWIN32 [Inputs] -o$(IntDir)%(QtMocFilename).cpp && cl.exe $(IntDir)%(QtMocFilename).cpp [QtCommandLine] /c /Fo"$(IntDir)%(QtMocFilename).obj"
- $(IntDir)%(QtMocFilename).obj
- %(FileName).hxx
- true
-
-
-
- Midl
- CustomBuild
-
-
-
- _qrc
- %(FileName)%(QtQrcPfx)
- %QTDIR%\bin\rcc.exe [inputs] -o $(IntDir)%(QtQrcFileName).cpp && cl.exe $(IntDir)%(QtQrcFileName).cpp /c /Fo"$(IntDir)%(QtQrcFileName)" [QtCommandLine]
- $(IntDir)%(QtQrcFileName).obj
- %(FileName).qrc
-
-
-
diff --git a/src/citra_qt/qt-build.targets b/src/citra_qt/qt-build.targets
deleted file mode 100644
index d0ae0d642..000000000
--- a/src/citra_qt/qt-build.targets
+++ /dev/null
@@ -1,247 +0,0 @@
-
-
-
-
-
-
- _UIC
-
-
- _MOC
-
-
- _QRC
-
-
-
- $(MSBuildThisFileDirectory)$(MSBuildThisFileName).xml
-
-
- $(MSBuildThisFileDirectory)$(MSBuildThisFileName).xml
-
-
- $(MSBuildThisFileDirectory)$(MSBuildThisFileName).xml
-
-
-
-
-
-
-
- @(UIC, '|')
-
-
-
-
-
-
-
-
- $(ComputeLinkInputsTargets);
- ComputeUICOutput;
-
-
- $(ComputeLibInputsTargets);
- ComputeUICOutput;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- @(MOC, '|')
-
-
-
-
-
-
-
-
- $(ComputeLinkInputsTargets);
- ComputeMOCOutput;
-
-
- $(ComputeLibInputsTargets);
- ComputeMOCOutput;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- @(QRC, '|')
-
-
-
-
-
-
-
-
- $(ComputeLinkInputsTargets);
- ComputeQRCOutput;
-
-
- $(ComputeLibInputsTargets);
- ComputeQRCOutput;
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/citra_qt/qt-build.xml b/src/citra_qt/qt-build.xml
deleted file mode 100644
index 7a69f5a88..000000000
--- a/src/citra_qt/qt-build.xml
+++ /dev/null
@@ -1,491 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- General
-
-
-
-
- Command Line
-
-
-
-
-
-
-
-
-
-
-
-
-
- Execute Before
-
-
- Specifies the targets for the build customization to run before.
-
-
-
-
-
-
-
-
-
-
- Execute After
-
-
- Specifies the targets for the build customization to run after.
-
-
-
-
-
-
-
-
-
-
-
-
-
- Additional Options
-
-
- Additional Options
-
-
-
-
-
-
-
-
-
-
-
-
-
- General
-
-
-
-
- Command Line
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Execute Before
-
-
- Specifies the targets for the build customization to run before.
-
-
-
-
-
-
-
-
-
-
- Execute After
-
-
- Specifies the targets for the build customization to run after.
-
-
-
-
-
-
-
-
-
-
-
-
-
- Additional Options
-
-
- Additional Options
-
-
-
-
-
-
-
-
-
-
-
-
-
- General
-
-
-
-
- Command Line
-
-
-
-
-
-
-
-
-
-
-
-
-
- Execute Before
-
-
- Specifies the targets for the build customization to run before.
-
-
-
-
-
-
-
-
-
-
- Execute After
-
-
- Specifies the targets for the build customization to run after.
-
-
-
-
-
-
-
-
-
-
-
-
-
- Additional Options
-
-
- Additional Options
-
-
-
-
-
-
-
--
cgit v1.2.3