mirror of
https://github.com/gryf/gryf-overlay.git
synced 2026-04-19 07:53:34 +02:00
Removed old versions of sdlmame
This commit is contained in:
@@ -1,28 +0,0 @@
|
||||
# work around gcc-4.9.3's implementation of cxx14
|
||||
# bug 582576 with patch from Alexander Miller
|
||||
# https://bugs.gentoo.org/show_bug.cgi?id=582576
|
||||
|
||||
--- a/src/lib/util/strformat.h
|
||||
+++ b/src/lib/util/strformat.h
|
||||
@@ -185,9 +185,8 @@
|
||||
#include <type_traits>
|
||||
#include <utility>
|
||||
|
||||
-#if defined(__GLIBCXX__) && (__GLIBCXX__ < 20150413)
|
||||
-namespace std
|
||||
-{
|
||||
+namespace std {
|
||||
+namespace mame_cxx14_compat {
|
||||
template<class _Container>
|
||||
inline constexpr auto
|
||||
cbegin(const _Container& __cont) noexcept(noexcept(std::begin(__cont)))-> decltype(std::begin(__cont))
|
||||
@@ -198,7 +197,8 @@
|
||||
cend(const _Container& __cont) noexcept(noexcept(std::end(__cont)))-> decltype(std::end(__cont))
|
||||
{ return std::end(__cont); }
|
||||
}
|
||||
-#endif
|
||||
+using namespace mame_cxx14_compat;
|
||||
+}
|
||||
|
||||
namespace util {
|
||||
namespace detail {
|
||||
@@ -1,29 +0,0 @@
|
||||
No point in adding qt-related things to the compile line unless the qt debugger is wanted
|
||||
|
||||
--- scripts/src/osd/sdl_cfg.lua.orig
|
||||
+++ scripts/src/osd/sdl_cfg.lua
|
||||
@@ -115,14 +115,16 @@
|
||||
configuration { }
|
||||
|
||||
elseif _OPTIONS["targetos"]=="linux" then
|
||||
- if _OPTIONS["QT_HOME"]~=nil then
|
||||
- buildoptions {
|
||||
- "-I" .. backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -query QT_INSTALL_HEADERS"),
|
||||
- }
|
||||
- else
|
||||
- buildoptions {
|
||||
- backtick("pkg-config --cflags Qt5Widgets"),
|
||||
- }
|
||||
+ if _OPTIONS["USE_QTDEBUG"]=="1" then
|
||||
+ if _OPTIONS["QT_HOME"]~=nil then
|
||||
+ buildoptions {
|
||||
+ "-I" .. backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -query QT_INSTALL_HEADERS"),
|
||||
+ }
|
||||
+ else
|
||||
+ buildoptions {
|
||||
+ backtick("pkg-config --cflags Qt5Widgets"),
|
||||
+ }
|
||||
+ end
|
||||
end
|
||||
elseif _OPTIONS["targetos"]=="macosx" then
|
||||
defines {
|
||||
Reference in New Issue
Block a user