From a28b5d17f2ac2f704fb88ec67ff6f66f2140e3cc Mon Sep 17 00:00:00 2001 From: Jay Dolan Date: Thu, 11 Feb 2021 17:44:45 -0500 Subject: [PATCH 1/4] Eclipse Python support for Scons files. --- .project | 6 ++++++ .pydevproject | 7 +++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.project b/.project index 7892142c..d0445242 100644 --- a/.project +++ b/.project @@ -5,6 +5,11 @@ + + org.python.pydev.PyDevBuilder + + + org.eclipse.cdt.managedbuilder.core.genmakebuilder clean,full,incremental, @@ -23,6 +28,7 @@ org.eclipse.cdt.core.ccnature org.eclipse.cdt.managedbuilder.core.managedBuildNature org.eclipse.cdt.managedbuilder.core.ScannerConfigNature + org.python.pydev.pythonNature diff --git a/.pydevproject b/.pydevproject index 40e9f40a..70849b3d 100644 --- a/.pydevproject +++ b/.pydevproject @@ -1,5 +1,8 @@ -Default -python 2.7 + + Default + + python 2.7 + From ce6af0b4650384fdf43bdec3828bac2b6b6362e3 Mon Sep 17 00:00:00 2001 From: Jay Dolan Date: Thu, 11 Feb 2021 17:45:04 -0500 Subject: [PATCH 2/4] Remove stale Quake Live VFS plugin references. --- GtkRadiant-build-commands.json | 180 --------------------------------- GtkRadiant.srctrlprj | 1 - 2 files changed, 181 deletions(-) diff --git a/GtkRadiant-build-commands.json b/GtkRadiant-build-commands.json index d10ffd7e..9fa9f80d 100644 --- a/GtkRadiant-build-commands.json +++ b/GtkRadiant-build-commands.json @@ -448,51 +448,6 @@ "directory": "/home/timo/GtkRadiant/GtkRadiant", "file": "plugins/vfspk3/unzip.cpp" }, - { - "arguments": [ - "c++", - "-c", - "-pipe", - "-Wall", - "-fmessage-length=0", - "-fvisibility=hidden", - "-I/usr/include/libxml2", - "-fpermissive", - "-fvisibility-inlines-hidden", - "-O2", - "-fno-strict-aliasing", - "-pthread", - "-pipe", - "-Wall", - "-fmessage-length=0", - "-fvisibility=hidden", - "-I/usr/include/libxml2", - "-fPIC", - "-DQ_NO_STLPORT", - "-I/usr/include/gtk-2.0", - "-I/usr/lib/x86_64-linux-gnu/gtk-2.0/include", - "-I/usr/include/gio-unix-2.0", - "-I/usr/include/cairo", - "-I/usr/include/pango-1.0", - "-I/usr/include/atk-1.0", - "-I/usr/include/pixman-1", - "-I/usr/include/libpng16", - "-I/usr/include/gdk-pixbuf-2.0", - "-I/usr/include/harfbuzz", - "-I/usr/include/glib-2.0", - "-I/usr/lib/x86_64-linux-gnu/glib-2.0/include", - "-I/usr/include/freetype2", - "-Ibuild/release/shobjs/include", - "-Iinclude", - "-Ibuild/release/shobjs/libs", - "-Ilibs", - "-o", - "build/release/shobjs/plugins/vfsqlpk3/unzip.os", - "plugins/vfsqlpk3/unzip.cpp" - ], - "directory": "/home/timo/GtkRadiant/GtkRadiant", - "file": "plugins/vfsqlpk3/unzip.cpp" - }, { "arguments": [ "cc", @@ -4669,51 +4624,6 @@ "directory": "/home/timo/GtkRadiant/GtkRadiant", "file": "tools/urt/tools/quake3/q3map2/brush_primit.c" }, - { - "arguments": [ - "c++", - "-c", - "-pipe", - "-Wall", - "-fmessage-length=0", - "-fvisibility=hidden", - "-I/usr/include/libxml2", - "-fpermissive", - "-fvisibility-inlines-hidden", - "-O2", - "-fno-strict-aliasing", - "-pthread", - "-pipe", - "-Wall", - "-fmessage-length=0", - "-fvisibility=hidden", - "-I/usr/include/libxml2", - "-fPIC", - "-DQ_NO_STLPORT", - "-I/usr/include/gtk-2.0", - "-I/usr/lib/x86_64-linux-gnu/gtk-2.0/include", - "-I/usr/include/gio-unix-2.0", - "-I/usr/include/cairo", - "-I/usr/include/pango-1.0", - "-I/usr/include/atk-1.0", - "-I/usr/include/pixman-1", - "-I/usr/include/libpng16", - "-I/usr/include/gdk-pixbuf-2.0", - "-I/usr/include/harfbuzz", - "-I/usr/include/glib-2.0", - "-I/usr/lib/x86_64-linux-gnu/glib-2.0/include", - "-I/usr/include/freetype2", - "-Ibuild/release/shobjs/include", - "-Iinclude", - "-Ibuild/release/shobjs/libs", - "-Ilibs", - "-o", - "build/release/shobjs/plugins/vfsqlpk3/vfs.os", - "plugins/vfsqlpk3/vfs.cpp" - ], - "directory": "/home/timo/GtkRadiant/GtkRadiant", - "file": "plugins/vfsqlpk3/vfs.cpp" - }, { "arguments": [ "cc", @@ -6859,51 +6769,6 @@ "directory": "/home/timo/GtkRadiant/GtkRadiant", "file": "tools/urt/tools/quake3/q3map2/vis.c" }, - { - "arguments": [ - "c++", - "-c", - "-pipe", - "-Wall", - "-fmessage-length=0", - "-fvisibility=hidden", - "-I/usr/include/libxml2", - "-fpermissive", - "-fvisibility-inlines-hidden", - "-O2", - "-fno-strict-aliasing", - "-pthread", - "-pipe", - "-Wall", - "-fmessage-length=0", - "-fvisibility=hidden", - "-I/usr/include/libxml2", - "-fPIC", - "-DQ_NO_STLPORT", - "-I/usr/include/gtk-2.0", - "-I/usr/lib/x86_64-linux-gnu/gtk-2.0/include", - "-I/usr/include/gio-unix-2.0", - "-I/usr/include/cairo", - "-I/usr/include/pango-1.0", - "-I/usr/include/atk-1.0", - "-I/usr/include/pixman-1", - "-I/usr/include/libpng16", - "-I/usr/include/gdk-pixbuf-2.0", - "-I/usr/include/harfbuzz", - "-I/usr/include/glib-2.0", - "-I/usr/lib/x86_64-linux-gnu/glib-2.0/include", - "-I/usr/include/freetype2", - "-Ibuild/release/shobjs/include", - "-Iinclude", - "-Ibuild/release/shobjs/libs", - "-Ilibs", - "-o", - "build/release/shobjs/plugins/vfsqlpk3/vfsqlpk3.os", - "plugins/vfsqlpk3/vfsqlpk3.cpp" - ], - "directory": "/home/timo/GtkRadiant/GtkRadiant", - "file": "plugins/vfsqlpk3/vfsqlpk3.cpp" - }, { "arguments": [ "c++", @@ -10996,51 +10861,6 @@ "directory": "/home/timo/GtkRadiant/GtkRadiant", "file": "libs/picomodel/pm_obj.c" }, - { - "arguments": [ - "c++", - "-c", - "-pipe", - "-Wall", - "-fmessage-length=0", - "-fvisibility=hidden", - "-I/usr/include/libxml2", - "-fpermissive", - "-fvisibility-inlines-hidden", - "-O2", - "-fno-strict-aliasing", - "-pthread", - "-pipe", - "-Wall", - "-fmessage-length=0", - "-fvisibility=hidden", - "-I/usr/include/libxml2", - "-fPIC", - "-DQ_NO_STLPORT", - "-I/usr/include/gtk-2.0", - "-I/usr/lib/x86_64-linux-gnu/gtk-2.0/include", - "-I/usr/include/gio-unix-2.0", - "-I/usr/include/cairo", - "-I/usr/include/pango-1.0", - "-I/usr/include/atk-1.0", - "-I/usr/include/pixman-1", - "-I/usr/include/libpng16", - "-I/usr/include/gdk-pixbuf-2.0", - "-I/usr/include/harfbuzz", - "-I/usr/include/glib-2.0", - "-I/usr/lib/x86_64-linux-gnu/glib-2.0/include", - "-I/usr/include/freetype2", - "-Ibuild/release/shobjs/include", - "-Iinclude", - "-Ibuild/release/shobjs/libs", - "-Ilibs", - "-o", - "build/release/shobjs/plugins/vfsqlpk3/qlvfs.os", - "plugins/vfsqlpk3/qlvfs.cpp" - ], - "directory": "/home/timo/GtkRadiant/GtkRadiant", - "file": "plugins/vfsqlpk3/qlvfs.cpp" - }, { "arguments": [ "cc", diff --git a/GtkRadiant.srctrlprj b/GtkRadiant.srctrlprj index aed09a46..404a3346 100644 --- a/GtkRadiant.srctrlprj +++ b/GtkRadiant.srctrlprj @@ -38,7 +38,6 @@ plugins/textool plugins/vfspak plugins/vfspk3 - plugins/vfsqlpk3 plugins/vfswad radiant tools/quake3/common From af11890c68a075451d7c4043d8abae916d58ef28 Mon Sep 17 00:00:00 2001 From: Jay Dolan Date: Sat, 13 Feb 2021 12:12:30 -0500 Subject: [PATCH 3/4] Ensure macOS build targets 10.9 SDK. --- config.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config.py b/config.py index a757268f..0c5b572a 100644 --- a/config.py +++ b/config.py @@ -263,6 +263,8 @@ class Config: # On Mac, we pad headers so that we may rewrite them for packaging if ( self.platform == 'Darwin' ) : + env.Append( CFLAGS = [ '-mmacosx-version-min=10.9' ] ) + env.Append( CXXFLAGS = [ '-mmacosx-version-min=10.9' ] ) env.Append( LINKFLAGS = [ '-headerpad_max_install_names' ] ) def CheckoutOrUpdate( self, svnurl, path ): From bbae5359facf5e39cd7d8dd91558c764db567024 Mon Sep 17 00:00:00 2001 From: Jay Dolan Date: Mon, 1 Mar 2021 17:15:41 -0500 Subject: [PATCH 4/4] Fix gcc8 compilation issue on Linux. --- radiant/camwindow.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/radiant/camwindow.cpp b/radiant/camwindow.cpp index 905b1118..e826fbfc 100644 --- a/radiant/camwindow.cpp +++ b/radiant/camwindow.cpp @@ -433,6 +433,8 @@ void CamWnd::Cam_KeyControl( float dtime ) { static vec3_t avelocity; static vec3_t velocity; + const vec3_t up = { 0, 0, 1 }; + // Update angles if ( m_Camera.movementflags & MOVE_ROTLEFT ) { avelocity[YAW] += dtime * g_PrefsDlg.m_nAngleSpeed; @@ -476,14 +478,14 @@ void CamWnd::Cam_KeyControl( float dtime ) { VectorMA( velocity, dtime * g_PrefsDlg.m_nMoveSpeed, m_Camera.right, velocity ); } if ( m_Camera.movementflags & MOVE_UP ) { - VectorMA( velocity, dtime * g_PrefsDlg.m_nMoveSpeed, (vec3_t) { 0, 0, 1 }, velocity); + VectorMA( velocity, dtime * g_PrefsDlg.m_nMoveSpeed, up, velocity ); } if ( m_Camera.movementflags & MOVE_DOWN ) { - VectorMA( velocity, -dtime * g_PrefsDlg.m_nMoveSpeed, (vec3_t) { 0, 0, 1 }, velocity); + VectorMA( velocity, -dtime * g_PrefsDlg.m_nMoveSpeed, up, velocity ); } // Now move the origin by the scaled velocity - VectorMA( m_Camera.origin, dtime, velocity, m_Camera.origin); + VectorMA( m_Camera.origin, dtime, velocity, m_Camera.origin ); // And then add some friction to slow us down VectorScale( velocity, 1.f - dtime, velocity );