You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
65 lines
1.6 KiB
65 lines
1.6 KiB
--- src/makefile
|
|
+++ src/makefile
|
|
@@ -203,7 +203,7 @@
|
|
#
|
|
# This is my compiler of choice, it seems to work most everywhere
|
|
#
|
|
-CC = gcc
|
|
+CC ?= gcc
|
|
|
|
# For allowing #if..#else..#endif constructs in LUA files - C. Blue
|
|
# Note: The flags must contain
|
|
@@ -215,16 +215,26 @@
|
|
# need to use the gcc invocation below instead.
|
|
#
|
|
# cpp variant:
|
|
-CPP = cpp
|
|
-CPPFLAGS = -C -P
|
|
+#CPP = cpp
|
|
+#CPPFLAGS = -C -P
|
|
# gcc variant:
|
|
-#CPP = gcc
|
|
-#CPPFLAGS = -x c -E -Wp,-C,-P
|
|
+CPP ?= gcc
|
|
+CPPFLAGS = -x c -E -Wp,-C,-P
|
|
|
|
|
|
# For variations with X11
|
|
X11BASE = /usr/X11R6
|
|
|
|
+# defines
|
|
+ifdef USE_SDL
|
|
+CFLAGS += -DSOUND_SDL $(shell sdl-config --cflags)
|
|
+SDL_LIBS = $(shell sdl-config --libs) -lSDL_mixer
|
|
+endif
|
|
+
|
|
+ifdef USE_X
|
|
+CFLAGS += -I${X11BASE}/include -DUSE_X11
|
|
+LIBS += -L${X11BASE}/lib -lX11
|
|
+endif
|
|
|
|
##
|
|
## Standard version -- supports X11 (main-x11.c)
|
|
@@ -256,8 +266,9 @@
|
|
# attempt to "guess" at many of these flags based on your system.
|
|
#
|
|
## With SDL
|
|
-CFLAGS = -g -pipe -Wall -DUSE_X11 -DUSE_GCU -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -DSOUND_SDL `sdl-config --cflags`
|
|
-LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 -lncurses -lcrypt -lm `sdl-config --libs` -lSDL_mixer
|
|
+CFLAGS += -Wall
|
|
+CFLAGS += -DUSE_GCU -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937
|
|
+LIBS += -L/usr/pkg/lib -lncurses -lcrypt -lm ${SDL_LIBS}
|
|
##
|
|
## Without SDL
|
|
#CFLAGS = -g -pipe -Wall -DUSE_X11 -DUSE_GCU -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937
|
|
@@ -357,9 +368,6 @@
|
|
# Compile a client with 'test client' version/tag
|
|
tomenet.test: CFLAGS += -DTEST_CLIENT -O0
|
|
|
|
-# Normal release build
|
|
-tomenet: CFLAGS += -O2
|
|
-
|
|
|
|
# Lua
|
|
SRCS += $(LUASRCS)
|