Fixed a quirk with the user_main prototype

diff --git a/.gitignore b/.gitignore
index bbf313b25987d0d61b1cea33a8e6188501e221ac..891ec23a29d91f90cdd12af091018b3d335236c7 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,4 @@
 
 # Debug files
 *.dSYM/
+.rsconscache

diff --git a/build.rb b/build.rb
index b0a131d3b6f2ae9f16e11d75cda27f149bb95cc3..ab729b0861e6b1630f6d285f35a6fa9b263ac3c0 100755 (executable)
--- a/build.rb
+++ b/build.rb
@@ -1,4 +1,25 @@
 #!/usr/bin/env ruby
-
 require './modules/build-system/setup'
 
+#------------------------------------------------------------------------------
+# Environment Definitions
+#------------------------------------------------------------------------------
+# Define the default compiler environment
+main_env = BuildEnv.new do |env|
+  env["CFLAGS"]  += ['-O3', '-Wall', '-Wextra', '--std=c99', '--pedantic']
+  env["CPPPATH"] += Dir['source/']
+end
+
+#------------------------------------------------------------------------------
+# Release Build Targets
+#------------------------------------------------------------------------------
+# Build the library
+main_env.Library('libc.a', FileList['source/**/*.c'])
+
+#------------------------------------------------------------------------------
+# Test Build Targets
+#------------------------------------------------------------------------------
+if Opts[:profile].include? "test"
+  # Do nothing for now
+end
+

diff --git a/source/libc.h b/source/libc.h
index 353df8f39a65e8c3c19775c8f42c4c820910f854..330a5bfee3233ae4c8792e1ae613517b1e45e6f6 100644 (file)
--- a/source/libc.h
+++ b/source/libc.h
@@ -206,7 +206,7 @@ void exits(char*);
  */
 #ifndef NO_MAIN_WRAPPER
     #define main user_main
-    extern void user_main(int, char**);
 #endif
+void user_main(int, char**);
 
 #endif /* LIBC_H */