projects
/
micropolis
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
allow overriding $CC for tclx
[micropolis]
/
src
/
sim
/
makefile
diff --git
a/src/sim/makefile
b/src/sim/makefile
index 08778efbf14ee54dfc244481acc861f42aa439d9..f773cd9a3ae65bb60df3808e4ba66010694a2163 100644
(file)
--- a/
src/sim/makefile
+++ b/
src/sim/makefile
@@
-5,18
+5,21
@@
TCLXHOME = ../tclx
TCLLIBRARY = /usr/local/lib/tcl
TKLIBRARY = /usr/local/lib/tk
TCLLIBRARY = /usr/local/lib/tcl
TKLIBRARY = /usr/local/lib/tk
+SDLINCLUDE = $$(/bin/sh ./sdl_helper cflags)
+SDLLIBS = $$(/bin/sh ./sdl_helper libs)
+
CC = gcc
OPTFLAGS = -O3
#OPTFLAGS = -g
#DEFINES = -DIS_LINUX -DCAM -DNET
CC = gcc
OPTFLAGS = -O3
#OPTFLAGS = -g
#DEFINES = -DIS_LINUX -DCAM -DNET
-DEFINES = -DIS_LINUX
+DEFINES = -DIS_LINUX
#-DNO_AIRCRASH
-CFLAGS
= $(OPTFLAGS) $(DEFINES)
+CFLAGS
+= $(OPTFLAGS) $(DEFINES) -Wall
#LDFLAGS = -Bstatic
#LDFLAGS = -Bstatic
-LDFLAGS=-L/usr/X11/lib
+LDFLAGS=-L/usr/X11/lib
-L/usr/X11R6/lib
INSTALL = install -s
INSTALL = install -s
@@
-26,7
+29,8
@@
INCLUDES = \
-I$(XINCLUDE) \
-I$(TCLHOME) \
-I$(TCLXHOME)/src \
-I$(XINCLUDE) \
-I$(TCLHOME) \
-I$(TCLXHOME)/src \
- -I$(TKHOME)
+ -I$(TKHOME) \
+ $(SDLINCLUDE)
CPPFLAGS = $(INCLUDES)
CPPFLAGS = $(INCLUDES)
@@
-35,7
+39,8
@@
LIBS = $(TCLXHOME)/libtk.a \
-lm \
-lX11 \
-lXext \
-lm \
-lX11 \
-lXext \
- -lXpm
+ -lXpm \
+ $(SDLLIBS)
SRCS = \
sim.c \
SRCS = \
sim.c \
Impressum
,
Datenschutz