Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 129393 Details for
Bug 188214
games-fps/edge (new ebuild) (Enhanced DOOM engine)
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
1.29_fltk-glbsp_fixes.patch
1.29_fltk-glbsp_fixes.patch (text/plain), 1.99 KB, created by
Davide Cendron (RETIRED)
on 2007-08-27 22:07:36 UTC
(
hide
)
Description:
1.29_fltk-glbsp_fixes.patch
Filename:
MIME Type:
Creator:
Davide Cendron (RETIRED)
Created:
2007-08-27 22:07:36 UTC
Size:
1.99 KB
patch
obsolete
>diff -urNP edge-1.29-source/SConstruct edge-1.29-source_work/SConstruct >--- edge-1.29-source/SConstruct 2007-06-06 15:07:47.000000000 +0200 >+++ edge-1.29-source_work/SConstruct 2007-08-27 23:45:44.000000000 +0200 >@@ -24,6 +24,8 @@ > > base_env = Environment() > >+base_env.SConsignFile() >+ > if build_info['cross']: > base_env.Tool('crossmingw', toolpath=['build']) > >@@ -95,10 +97,10 @@ > env.Append(LIBS = ['png', 'jpeg', 'z']) > > # FLTK >-if build_info['platform'] == 'linux' and build_info['release']: >+if build_info['platform'] == 'linux': > env.Append(CCFLAGS = ['-DUSE_FLTK']) >- env.ParseConfig('#linux_lib/fltk-1.1.7/fltk-config --cflags') >- env.Append(LIBPATH = ['#linux_lib/fltk-1.1.7/lib']) >+ env.ParseConfig('fltk-config --cflags') >+ env.ParseConfig('fltk-config --ldflags') > env.Append(LIBS = ['fltk', 'fltk_images']) > > # HawkNL >@@ -161,7 +163,6 @@ > SConscript('src/SConscript') > SConscript('epi/SConscript') > SConscript('deh_edge/SConscript.edge') >-SConscript('glbsp/SConscript.edge') > SConscript('lzo/SConscript') > # SConscript('humidity/SConscript.edge') > >diff -urNP edge-1.29-source/src/l_glbsp.cc edge-1.29-source_work/src/l_glbsp.cc >--- edge-1.29-source/src/l_glbsp.cc 2007-05-28 08:59:34.000000000 +0200 >+++ edge-1.29-source_work/src/l_glbsp.cc 2007-08-27 23:47:39.000000000 +0200 >@@ -30,7 +30,11 @@ > #include "version.h" > > #include "epi/epi.h" >+#ifdef HAVE_GLOBAL_GLBSP_H >+#include "glbsp.h" >+#else > #include "glbsp/src/glbsp.h" >+#endif > > #include <stdio.h> > #include <stdarg.h> >diff -urNP edge-1.29-source/src/SConscript edge-1.29-source_work/src/SConscript >--- edge-1.29-source/src/SConscript 2007-04-16 14:58:57.000000000 +0200 >+++ edge-1.29-source_work/src/SConscript 2007-08-27 23:46:41.000000000 +0200 >@@ -10,6 +10,11 @@ > > env.Append(CCFLAGS = ['-ffast-math']) > >+conf = Configure(env) >+if conf.CheckCXXHeader('glbsp.h'): >+ env.Append(CCFLAGS = ['-DHAVE_GLOBAL_GLBSP_H']) >+env = conf.Finish() >+ > # allow #include "epi/xxxx.h" to find the correct file > env.Append(CPPPATH = ['#.']) >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 188214
:
127344
|
127346
|
127367
|
127369
|
127377
|
129392
| 129393 |
129444
|
136450
|
136451
|
136452
|
162820