Cosmetics + started to prepare use without X11.

[universe.git] / Makefile

diff --git a/Makefile b/Makefile
index 6fc991d..23d8458 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -13,17 +13,19 @@
 # Contact <francois.fleuret@epfl.ch> for comments & bug reports                     #
 #============================================================================#
 
-# CXX=g++-3.3
-
 ifeq ($(DEBUG),yes)
  CXXFLAGS = -fPIC -Wall -g -DDEBUG
 else
  # Optimized compilation
-#  CXXFLAGS = -Wall -g -O3 -pg --coverage
+ # CXXFLAGS = -Wall -g -O3 -pg --coverage
  CXXFLAGS = -fPIC -Wall -g -O3
 endif
 
-LDFLAGS = -L/usr/X11R6/lib/ -lz -ldl
+LDFLAGS = -lz -ldl
+
+# Do we use X11?
+CXXFLAGS += -DX11_SUPPORT
+LDFLAGS += -L/usr/X11R6/lib/
 
 # Do we use cairo?
 CXXFLAGS += -I/usr/include/cairo -DCAIRO_SUPPORT