FreeBSD updates (Pedro Giffuni)

diff --git a/configs/freebsd b/configs/freebsd
index 95e51f25158845fc757ed39973cacd776e36222d..c390b8bf9c9c7a63e1901b08fa9e57e0668a27f2 100644 (file)
--- a/configs/freebsd
+++ b/configs/freebsd
@@ -5,13 +5,22 @@ include $(TOP)/configs/default
 CONFIG_NAME = FreeBSD
 
 # Compiler and flags
-CC = gcc
-CXX = g++
+CC = cc
+CXX = c++
 MAKE = gmake
 
-CFLAGS = -O2 -fPIC -pedantic -I/usr/X11R6/include -DUSE_XSHM -DHZ=100 \
-       $(ASM_FLAGS)
-CXXFLAGS = -O2 -fPIC -pedantic
+OPT_FLAGS  = -O2
+PIC_FLAGS  = -fPIC
+
+DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_BSD_SOURCE -DUSE_XSHM -DHZ=100
+
+X11_INCLUDES = -I/usr/X11R6/include
+
+CFLAGS += $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(DEFINES) $(X11_INCLUDES) -ffast-math -pedantic
+
+CXXFLAGS += $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(DEFINES) $(X11_INCLUDES)
+
 GLUT_CFLAGS = -fexceptions
 
-APP_LIB_DEPS = -L$(LIB_DIR) -L/usr/X11R6/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lXext -lXmu -lXi -lX11 -lm
+EXTRA_LIB_PATH = -L/usr/X11R6/lib
+APP_LIB_DEPS = -L$(LIB_DIR) $(EXTRA_LIB_PATH) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lXext -lXmu -lXi -lX11 -lm