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

Collapse All | Expand All

(-)fe3d_0.11_p77.orig/configure.ac (-6 / +5 lines)
Lines 46-61 Link Here
46 
		])
 46 
		])
47 
fi
 47 
fi
48 

          48
          

        

          
            

              49
              
CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"


              49
              
#CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"

            

            

              50
              
CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY"


              50
              
#CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY"

            

            

              51
              
CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"


              51
              
#CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"

            

            

              52
              
LIBS="$LIBS $WX_LIBS"


              52
              
#LIBS="$LIBS $WX_LIBS"

            

        

          53
          

          53
          

        

        

          54
          
AM_CPPFLAGS="$AM_CPPFLAGS $GL_CFLAGS $GLU_CFLAGS"

          54
          
AM_CPPFLAGS="$AM_CPPFLAGS $GL_CFLAGS $GLU_CFLAGS"

        

            

              55
              
AM_LDFLAGS="$AM_LDFLAGS $GL_LIBS $GLU_LIBS"

              
              
            

        

          56
          
AC_SUBST([AM_CPPFLAGS])

          55
          
AC_SUBST([AM_CPPFLAGS])

        

        

          57
          
AC_SUBST([AM_LDFLAGS])

          56
          
AC_SUBST([AM_LDFLAGS])

        

          
            

              58
              
AC_SUBST([$PREFIX])


              57
              
#AC_SUBST([$PREFIX])

            

        

          59
          

          58
          

        

        

          60
          
AC_OUTPUT

          59
          
AC_OUTPUT

        

        

          61
          

          60
          

        



(-)fe3d_0.11_p77.orig/src/Makefile.am
      (-2 / +4 lines)




  

    
      
            Lines 1-8
          
      
      
        Link Here
      
    
  

          
            

              1
              
fe3d_CPPFLAGS	= -DFE_DATA_DIR="\"@datadir@/@PACKAGE@/\""


              1
              
fe3d_CPPFLAGS	= -DFE_DATA_DIR="\"@datadir@/@PACKAGE@/\"" @WX_CPPFLAGS@

            

        

          2
          
INCLUDES		= -I$(top_srcdir)/include -I$(top_srcdir)/src/include

          2
          
INCLUDES		= -I$(top_srcdir)/include -I$(top_srcdir)/src/include

        

        

          3
          
bin_PROGRAMS	= fe3d

          3
          
bin_PROGRAMS	= fe3d

        

        

          4
          
fe3d_SOURCES	= fe_config.cpp fe_core.cpp  fe_draw.cpp fe_events.cpp fe_host.cpp fe_hosts.cpp fe_match.cpp fe_node.cpp fe_os_rgx.cpp fe_port.cpp fe_root_node.cpp fe_tools.cpp geo_cache.cpp gl_util.cpp libfe3d.cpp nmap_parser.cpp tex_cache.cpp wxfe3d_app.cpp wxfe3d_frame.cpp wxfe3d_glcanvas.cpp ui_nmap_ctrl.cpp ./gui/fe3d_ui.cpp ./regexp/Matcher.cpp ./regexp/Pattern.cpp ./regexp/WCMatcher.cpp ./regexp/WCPattern.cpp

          4
          
fe3d_SOURCES	= fe_config.cpp fe_core.cpp  fe_draw.cpp fe_events.cpp fe_host.cpp fe_hosts.cpp fe_match.cpp fe_node.cpp fe_os_rgx.cpp fe_port.cpp fe_root_node.cpp fe_tools.cpp geo_cache.cpp gl_util.cpp libfe3d.cpp nmap_parser.cpp tex_cache.cpp wxfe3d_app.cpp wxfe3d_frame.cpp wxfe3d_glcanvas.cpp ui_nmap_ctrl.cpp ./gui/fe3d_ui.cpp ./regexp/Matcher.cpp ./regexp/Pattern.cpp ./regexp/WCMatcher.cpp ./regexp/WCPattern.cpp

        

          
            

              5
              


              5
              
fe3d_CFLAGS 	= @WX_CFLAGS@

            

            

              
              

              6
              
fe3d_CXXFLAGS 	= @WX_CXXFLAGS_ONLY@

            

            


              7
              
fe3d_LDADD 	= @GLU_LIBS@ @WX_LIBS@

            

        

          6
          
fe3ddir		= @datadir@/@PACKAGE@

          8
          
fe3ddir		= @datadir@/@PACKAGE@

        

        

          7
          
fe3d_imgdir  	= @datadir@/@PACKAGE@/img

          9
          
fe3d_imgdir  	= @datadir@/@PACKAGE@/img

        

        

          8
          
fe3d_DATA	= $(top_srcdir)/data/*

          10
          
fe3d_DATA	= $(top_srcdir)/data/*

        






  

  Return to bug 277794