Browse Source

Remove private CFLAGS from .pc export. Also, get rid of _GNU_SOURCE.

tags/v1.3.1000
Jonathan Moore Liles 11 years ago
parent
commit
3eaf27c16b
2 changed files with 5 additions and 10 deletions
  1. +2
    -4
      src/Fl_Theme.cxx
  2. +3
    -6
      wscript

+ 2
- 4
src/Fl_Theme.cxx View File

@@ -56,14 +56,12 @@ Fl_Theme::get ( void )
static static
Fl_Preferences *prefs ( void ) Fl_Preferences *prefs ( void )
{ {
char *path;
char path[512];


asprintf( &path, "%s/.config/ntk/", getenv("HOME" ) );
snprintf( path, sizeof(path), "%s/.config/ntk/", getenv("HOME" ) );
Fl_Preferences *p = new Fl_Preferences( path, "ntk", "theme" ); Fl_Preferences *p = new Fl_Preferences( path, "ntk", "theme" );


free( path );

return p; return p;
} }




+ 3
- 6
wscript View File

@@ -29,11 +29,8 @@ children = [ 'fluid', 'test' ]
#children = [] #children = []


CFLAGS = [ '-pthread', CFLAGS = [ '-pthread',
'-ansi',
'-pedantic',
'-D_LARGEFILE64_SOURCE', '-D_LARGEFILE64_SOURCE',
'-D_FILE_OFFSET_BITS=64',
'-D_GNU_SOURCE' ]
'-D_FILE_OFFSET_BITS=64' ]


@conf @conf
def makelib(bld,*k,**kw): def makelib(bld,*k,**kw):
@@ -81,9 +78,9 @@ def configure(conf):
conf.load('gnu_dirs') conf.load('gnu_dirs')
# conf.load('ntk_fluid') # conf.load('ntk_fluid')
conf.line_just = 52 conf.line_just = 52
conf.env.append_value('CFLAGS', ['-Wall'])
conf.env.append_value('CFLAGS', ['-Wall', '-ansi','-pedantic'])
# conf.env.append_value('CXXFLAGS',['-Wall','-fno-exceptions', '-fno-rtti']) # conf.env.append_value('CXXFLAGS',['-Wall','-fno-exceptions', '-fno-rtti'])
conf.env.append_value('CXXFLAGS', ['-Wall'])
conf.env.append_value('CXXFLAGS', ['-Wall', '-ansi','-pedantic'])


conf.check_cfg(package='x11', uselib_store='X11', args="--cflags --libs", conf.check_cfg(package='x11', uselib_store='X11', args="--cflags --libs",
mandatory=True) mandatory=True)


Loading…
Cancel
Save