ioquake
/
gtkradiant
mirror of https://github.com/TTimo/GtkRadiant.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #665 from jdolan/master 

macOS and Linux build fixes
This commit is contained in:
Jay Dolan 2021-03-03 14:35:04 -05:00 committed by GitHub
parent 46abf34850 bbae5359fa
commit 06d96a5fe5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 18 additions and 186 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.project
View File

@ -5,6 +5,11 @@
<projects> <projects>
</projects> </projects>
<buildSpec> <buildSpec>
<buildCommand>
<name>org.python.pydev.PyDevBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand> <buildCommand>
<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name> <name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
<triggers>clean,full,incremental,</triggers> <triggers>clean,full,incremental,</triggers>
@ -23,6 +28,7 @@
<nature>org.eclipse.cdt.core.ccnature</nature> <nature>org.eclipse.cdt.core.ccnature</nature>
<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature> <nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature> <nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
<nature>org.python.pydev.pythonNature</nature>
</natures> </natures>
<filteredResources> <filteredResources>
<filter> <filter>

7
.pydevproject
View File

@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?eclipse-pydev version="1.0"?><pydev_project> <?eclipse-pydev version="1.0"?><pydev_project>
<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property> <pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
</pydev_project> </pydev_project>

180
GtkRadiant-build-commands.json
View File

@ -448,51 +448,6 @@
"directory": "/home/timo/GtkRadiant/GtkRadiant", "directory": "/home/timo/GtkRadiant/GtkRadiant",
"file": "plugins/vfspk3/unzip.cpp" "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": [ "arguments": [
"cc", "cc",
@ -4669,51 +4624,6 @@
"directory": "/home/timo/GtkRadiant/GtkRadiant", "directory": "/home/timo/GtkRadiant/GtkRadiant",
"file": "tools/urt/tools/quake3/q3map2/brush_primit.c" "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": [ "arguments": [
"cc", "cc",
@ -6859,51 +6769,6 @@
"directory": "/home/timo/GtkRadiant/GtkRadiant", "directory": "/home/timo/GtkRadiant/GtkRadiant",
"file": "tools/urt/tools/quake3/q3map2/vis.c" "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": [ "arguments": [
"c++", "c++",
@ -10996,51 +10861,6 @@
"directory": "/home/timo/GtkRadiant/GtkRadiant", "directory": "/home/timo/GtkRadiant/GtkRadiant",
"file": "libs/picomodel/pm_obj.c" "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": [ "arguments": [
"cc", "cc",

1
GtkRadiant.srctrlprj
View File

@ -38,7 +38,6 @@
<source_path>plugins/textool</source_path> <source_path>plugins/textool</source_path>
<source_path>plugins/vfspak</source_path> <source_path>plugins/vfspak</source_path>
<source_path>plugins/vfspk3</source_path> <source_path>plugins/vfspk3</source_path>
<source_path>plugins/vfsqlpk3</source_path>
<source_path>plugins/vfswad</source_path> <source_path>plugins/vfswad</source_path>
<source_path>radiant</source_path> <source_path>radiant</source_path>
<source_path>tools/quake3/common</source_path> <source_path>tools/quake3/common</source_path>

2
config.py
View File

@ -263,6 +263,8 @@ class Config:
# On Mac, we pad headers so that we may rewrite them for packaging # On Mac, we pad headers so that we may rewrite them for packaging
if ( self.platform == 'Darwin' ) : 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' ] ) env.Append( LINKFLAGS = [ '-headerpad_max_install_names' ] )
def CheckoutOrUpdate( self, svnurl, path ): def CheckoutOrUpdate( self, svnurl, path ):

8
radiant/camwindow.cpp
View File

@ -433,6 +433,8 @@ void CamWnd::Cam_KeyControl( float dtime ) {
static vec3_t avelocity; static vec3_t avelocity;
static vec3_t velocity; static vec3_t velocity;
const vec3_t up = { 0, 0, 1 };
// Update angles // Update angles
if ( m_Camera.movementflags & MOVE_ROTLEFT ) { if ( m_Camera.movementflags & MOVE_ROTLEFT ) {
avelocity[YAW] += dtime * g_PrefsDlg.m_nAngleSpeed; 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 ); VectorMA( velocity, dtime * g_PrefsDlg.m_nMoveSpeed, m_Camera.right, velocity );
} }
if ( m_Camera.movementflags & MOVE_UP ) { 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 ) { 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 // 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 // And then add some friction to slow us down
VectorScale( velocity, 1.f - dtime, velocity ); VectorScale( velocity, 1.f - dtime, velocity );