merged local and remote changes

diff --cc Rakefile
index 7c8ef6b5ec0a5d5bd3e5c24a3bdf6b1625407cd8,2be993b9134a7ed1434198d0ea8fe4bb2ab58913..e9cf8a08afc846d95282ea5b67f52e30ec46bc64
--- 1/Rakefile
--- 2/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
  
  #------------------------------------------------------------------------------