4 files changed, 61 insertions, 21 deletions

diff --git a/COMPILING b/COMPILING
new file mode 100644
index 000000000..9eb6b8f16
--- /dev/null
+++ b/COMPILING
@@ -0,0 +1,7 @@
+COMPILING

+=========

+

+To compile MCServer on *nix, either:

+1, Use GNU-compatible make (with GNUmakefile) directly, as described in the GNUmakefile header

+2, Copy makefile.debug or makefile.release as makefile and use any make-system

+3, Use "make -f makefile.debug" or "make -f makefile.release", if your make system accepts "-f <filename>" parameter
\ No newline at end of file
diff --git a/makefile.debug b/makefile.debug
new file mode 100644
index 000000000..e7d8b90d3
--- /dev/null
+++ b/makefile.debug
@@ -0,0 +1,25 @@
+###################################################
+#
+# Makefile template for MCServer
+# This makefile makes the debug version of MCServer (with gdb symbols, little to no optimizations)
+# To use this file, either copy it as makefile or run "make -f makefile.debug"
+#
+# Do NOT add file dependencies here, add them to makefile_base instead
+#
+###################################################
+
+
+# _X: These settings produce a debug build, with gdb symbols:
+CC_OPTIONS = -s -ggdb
+CCE_OPTIONS = -s -x c -ggdb
+LNK_OPTIONS = -lstdc++ -pthread -ggdb
+
+
+
+
+
+include makefile_base
+
+
+
+
diff --git a/makefile.release b/makefile.release
new file mode 100644
index 000000000..db5d781a4
--- /dev/null
+++ b/makefile.release
@@ -0,0 +1,24 @@
+###################################################
+#
+# Makefile template for MCServer
+# This makefile makes the release version of MCServer (no symbols, more optimizations)
+# To use this file, either copy it as makefile or run "make -f makefile.release"
+#
+# Do NOT add file dependencies here, add them to makefile_base instead
+#
+###################################################
+
+
+
+# _X: these settings should be used for the release build:
+CC_OPTIONS = -s -O3
+CCE_OPTIONS = -s -x c -O3
+LNK_OPTIONS = -lstdc++ -pthread -O3
+
+
+
+include makefile_base
+
+
+
+
diff --git a/makefile b/makefile_base
index ecc035092..650666b41 100644
--- a/makefile
+++ b/makefile_base
@@ -1,31 +1,15 @@
 ###################################################
 #
-# Makefile for MCServer
-# Creator [Xcode -> Makefile Ver: Feb 14 2007 09:18:41]
-# Created: [Thu Feb 24 19:53:17 2011]
+# Base for MCServer Makefile
+# This file only declares per-file dependencies; if a source file is added to the project, it needs to be added here
+# Do not make using this file directly, instead use the makefile.* wrappers, depending on what build you want
+# To use this file, either copy makefile.debug or makefile.release as makefile, or run "make -f makefile.debug" or "make -f makefile.release"
 #
 ###################################################
 
-#
-# Macros
-#
 
 CC = /usr/bin/g++
 
-# _X: These settings produce a debug build, with gdb symbols:
-# CC_OPTIONS = -s -ggdb
-# CCE_OPTIONS = -s -x c -ggdb
-# LNK_OPTIONS = -lstdc++ -pthread -ggdb
-
-
-# _X: these settings should be used for the release build:
-CC_OPTIONS = -s -O3
-CCE_OPTIONS = -s -x c -O3
-LNK_OPTIONS = -lstdc++ -pthread -O3
-
-
-
-
 #
 # INCLUDE directories for MCServer
 #
@@ -1570,4 +1554,4 @@ build/WSSCompact.o : source/WSSCompact.cpp
 # Template: copy and delete the "# "; insert filenames
 # build/.o : source/.cpp
 # 	$(CC) $(CC_OPTIONS) source/.cpp -c $(INCLUDE) -o build/.o	
-##### END RUN ####
+