Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 188214 | Differences between
and this patch

Collapse All | Expand All

(-)edge-1.29-source/SConstruct (-4 / +5 lines)
Lines 24-29 Link Here
24 

          24
          

        

        

          25
          
base_env = Environment()

          25
          
base_env = Environment()

        

        

          26
          

          26
          

        

            

              
              
              27
              
base_env.SConsignFile()

            

            

              28
              

            

        

          27
          
if build_info['cross']:

          29
          
if build_info['cross']:

        

        

          28
          
  base_env.Tool('crossmingw', toolpath=['build'])

          30
          
  base_env.Tool('crossmingw', toolpath=['build'])

        

        

          29
          

          31
          

        

  

    
      
            Lines 95-104
          
      
      
        Link Here
      
    
  

        

          95
          
env.Append(LIBS = ['png', 'jpeg', 'z'])

          97
          
env.Append(LIBS = ['png', 'jpeg', 'z'])

        

        

          96
          

          98
          

        

        

          97
          
# FLTK

          99
          
# FLTK

        

          
            

              98
              
if build_info['platform'] == 'linux' and build_info['release']:


              100
              
if build_info['platform'] == 'linux':

            

        

          99
          
    env.Append(CCFLAGS = ['-DUSE_FLTK'])

          101
          
    env.Append(CCFLAGS = ['-DUSE_FLTK'])

        

          
            

              100
              
    env.ParseConfig('#linux_lib/fltk-1.1.7/fltk-config --cflags')


              102
              
    env.ParseConfig('fltk-config --cflags')

            

            

              101
              
    env.Append(LIBPATH = ['#linux_lib/fltk-1.1.7/lib'])


              103
              
    env.ParseConfig('fltk-config --ldflags')

            

        

          102
          
    env.Append(LIBS = ['fltk', 'fltk_images'])

          104
          
    env.Append(LIBS = ['fltk', 'fltk_images'])

        

        

          103
          

          105
          

        

        

          104
          
# HawkNL

          106
          
# HawkNL

        

  

    
      
            Lines 161-167
          
      
      
        Link Here
      
    
  

        

          161
          
SConscript('src/SConscript')

          163
          
SConscript('src/SConscript')

        

        

          162
          
SConscript('epi/SConscript')

          164
          
SConscript('epi/SConscript')

        

        

          163
          
SConscript('deh_edge/SConscript.edge')

          165
          
SConscript('deh_edge/SConscript.edge')

        

            

              164
              
SConscript('glbsp/SConscript.edge')

              
              
            

        

          165
          
SConscript('lzo/SConscript')

          166
          
SConscript('lzo/SConscript')

        

        

          166
          
# SConscript('humidity/SConscript.edge')

          167
          
# SConscript('humidity/SConscript.edge')

        



(-)edge-1.29-source/src/l_glbsp.cc
      (+4 lines)




  

    
      
            Lines 30-36
          
      
      
        Link Here
      
    
  

        

          30
          
#include "version.h"

          30
          
#include "version.h"

        

        

          31
          

          31
          

        

        

          32
          
#include "epi/epi.h"

          32
          
#include "epi/epi.h"

        

            

              
              
              33
              
#ifdef HAVE_GLOBAL_GLBSP_H

            

            

              34
              
#include "glbsp.h"

            

            

              35
              
#else

            

        

          33
          
#include "glbsp/src/glbsp.h"

          36
          
#include "glbsp/src/glbsp.h"

        

            

              
              
              37
              
#endif

            

        

          34
          

          38
          

        

        

          35
          
#include <stdio.h>

          39
          
#include <stdio.h>

        

        

          36
          
#include <stdarg.h>

          40
          
#include <stdarg.h>

        



(-)edge-1.29-source/src/SConscript
      (+5 lines)




  

    
      
            Lines 10-15
          
      
      
        Link Here
      
    
  

        

          10
          

          10
          

        

        

          11
          
env.Append(CCFLAGS = ['-ffast-math'])

          11
          
env.Append(CCFLAGS = ['-ffast-math'])

        

        

          12
          

          12
          

        

            

              
              
              13
              
conf = Configure(env) 

            

            

              14
              
if conf.CheckCXXHeader('glbsp.h'): 

            

            

              15
              
  env.Append(CCFLAGS = ['-DHAVE_GLOBAL_GLBSP_H']) 

            

            

              16
              
env = conf.Finish()

            

            

              17
              

            

        

          13
          
# allow #include "epi/xxxx.h" to find the correct file

          18
          
# allow #include "epi/xxxx.h" to find the correct file

        

        

          14
          
env.Append(CPPPATH = ['#.'])

          19
          
env.Append(CPPPATH = ['#.'])

        

        

          15
          

          20
          

        






  

  Return to bug 188214