From: Mike D. Lowis Date: Tue, 9 Jun 2015 14:19:16 +0000 (-0400) Subject: Added dependency on libc X-Git-Url: https://git.mdlowis.com/?a=commitdiff_plain;h=91826d967aba7819f88228651d124b7ceeeb7eff;p=proto%2Fgir.git Added dependency on libc --- diff --git a/.gitmodules b/.gitmodules index 5235c74..e1fa136 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "modules/build-system"] path = modules/build-system url = https://github.com/mikedlowis/build-system.git +[submodule "modules/libc"] + path = modules/libc + url = https://github.com/mikedlowis/libc.git diff --git a/build.rb b/build.rb index 2893e8a..22daa86 100755 --- a/build.rb +++ b/build.rb @@ -7,7 +7,8 @@ require './modules/build-system/setup' # Define the default compiler environment main_env = BuildEnv.new do |env| env["CFLAGS"] += ['-O3', '-Wall', '-Wextra', '--std=c99', '--pedantic'] - env["CPPPATH"] += Dir['modules/libcds/source/**/'] + [ ] + env["CPPPATH"] += Dir['modules/libcds/source/**/'] + + Dir['modules/libc/source/**/'] end #------------------------------------------------------------------------------ @@ -15,7 +16,8 @@ end #------------------------------------------------------------------------------ # Build third party libraries main_env.Library('build/lib/libcds.a', FileList['modules/libcds/source/**/*.c']) -runtime_libs = ['build/lib/libcds.a'] +main_env.Library('build/lib/libc.a', FileList['modules/libc/source/**/*.c']) +runtime_libs = ['build/lib/libcds.a', 'build/lib/libc.a'] # Build the parser main_env.Program('parser', FileList['source/*.c'] + runtime_libs) diff --git a/modules/libc b/modules/libc new file mode 160000 index 0000000..c5c3aec --- /dev/null +++ b/modules/libc @@ -0,0 +1 @@ +Subproject commit c5c3aecf3f5340b19cffe4fc3a42bfbe8cd2efc6