[ShareDaemon-CVS] core/src Makefile.cvs,1.10,1.11 README,1.1,1.2

[<bo...@us...>]

Update of /cvsroot/sharedaemon/core/src
In directory sc8-pr-cvs1:/tmp/cvs-serv11726

Modified Files:
	Makefile.cvs README 
Log Message:
Hopefully fixed all compilation problems caused by the Makefile.cvs. Updated information in README to reflect the changes.

Index: Makefile.cvs
===================================================================
RCS file: /cvsroot/sharedaemon/core/src/Makefile.cvs,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Makefile.cvs	21 Nov 2003 19:31:02 -0000	1.10
+++ Makefile.cvs	22 Nov 2003 03:22:56 -0000	1.11
@@ -20,14 +20,44 @@
 
 all: test
 
-#CXX = /usr/i686-mingw32msvc/bin/g++
-#CC  = /usr/i686-mingw32msvc/bin/gcc
+CPPFLAGS = 
 
-CFLAGS    = -g -Wall -O3 -std=c99
-CXXFLAGS  = -g -Wall -O3
-CPPFLAGS  = -DXMULE2
-# You may set -DHAVE_ANSI_COLORS to get colored output
-LDFLAGS  += -g -lm -lwsock32
+# Ok, you have to tell me, what OS you are using
+
+# If you have a Linux system, uncomment the following lines by removing
+# the hash signs ('#'). If you don't have a Linux system. Comment them
+# out by prefixing them by a hash sign.
+
+# LINUX = true
+
+# If you have a Win32 system, behave like for Linux, but with the following
+# line
+
+WIN32 = true
+
+# If you have a Mac OS X system, ...
+
+# MAXOSX = true
+
+
+# Do you want colored debug output? If yes, uncomment the following line.
+
+# CPPFLAGS += -DHAVE_ANSI_COLORS
+
+# ######################
+# 
+# You shouldn't need to change anything below.
+
+ifdef WIN32
+CXX       = g++ -b i686-mingw32msvc
+CC        = gcc -b i686-mingw32msvc
+LDFLAGS  += -lwsock32
+endif
+
+CFLAGS   += -g -Wall -O3 -std=c99
+CXXFLAGS += -g -Wall -O3
+CPPFLAGS += -DXMULE2
+LDFLAGS  += -g -lm
 # -lstdc++
 
 OBJS = ClientList.oo Client.oo test.oo ClientShadow.oo Socket.oo osdep.oo \

Index: README
===================================================================
RCS file: /cvsroot/sharedaemon/core/src/README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- README	22 Nov 2003 02:51:07 -0000	1.1
+++ README	22 Nov 2003 03:22:56 -0000	1.2
@@ -1,28 +1,8 @@
 The code for the core should compile fine for Linux, Mac OS X and Win32 (using 
 the MingW32 version of the compiler gcc).
 
-Linux
------
-
-	No changes are needed.
-	
-	Simply type "make -f Makefile.cvs" and everything should be ok.
-
-
-Windows 95, 98, ME, NT, 2K, XP (and whatever will follow)
----------------------------------------------------------
-
-	Edit Makefile.cvs so that the Line starting with CPPFLAGS
-	also contains the option -DWIN32.
-	
-	Afterwards, type "make -f Makefile.cvs" and everything should be ok.
-
-Mac OS X
---------
-
-	Edit Makefile.cvs so that the Line starting with CPPFLAGS
-	also contains the option -DMACOSX.
-	
-	Type "make -f Makefile.cvs" after that, and everything should be ok.
-
+For informations on how to change the Makefile.cvs to fit your system, read 
+the comments there.
 
+After you have done this, type "make -f Makefile.cvs" and everything should 
+work fine.