From: Michael D. Lowis <mike@mdlowis.com>
Date: Wed, 24 Sep 2014 12:38:06 +0000 (-0400)
Subject: merged local and remote changes
X-Git-Url: https://git.mdlowis.com/?a=commitdiff_plain;h=2cdc07bb298b9a77ea765eda4d4951a918d80360;p=proto%2Fsclpl.git

merged local and remote changes
---

2cdc07bb298b9a77ea765eda4d4951a918d80360
diff --cc Rakefile
index 7c8ef6b,2be993b..e9cf8a0
--- a/Rakefile
+++ b/Rakefile
@@@ -3,11 -10,8 +10,8 @@@ en
  # Define the compiler environment
  BaseEnv = BuildEnv.new(echo: :command) do |env|
    env.build_dir('source','build/obj/source')
--  env.set_toolset(:clang)
- #  env['CC'] = 'clang'
- #  env['CXX'] = 'clang'
- #  env['LD'] = 'clang'
-   env["CFLAGS"] += ['--std=gnu99', '-Wall', '-Wextra' ]#, '-Werror']
 -  env["CFLAGS"] += ['-Wall', '-Wextra' ]#, '-Werror']
++  env.set_toolset(:gcc)
++  env["CFLAGS"] += ['--std=c99', '-Wall', '-Wextra']#, '-Werror']
  end
  
  #------------------------------------------------------------------------------