blob: fe209e1db953b94ea5b97429807651b73b2958e2 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
|
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,6 @@
# (the program should compile with no warning messages - if you
# see a warning message please let me know about it)
# ------------------------------------------------------------
-CC = cc
# STEP 2: IF YOU WANT TO COMPILE WITH THE MESA LIBRARIES THEN
@@ -39,7 +38,8 @@
# ------------------------------------------------------------
#GLIB = -lMesaGL -lMesaGLU
# or
-GLIB = -lGL -lGLU
+GLIB_CFLAGS = `pkg-config --cflags gl` `pkg-config --cflags glu`
+GLIB_LIBS = `pkg-config --libs gl` `pkg-config --libs glu`
# STEP 4: CHOOSE WHICH HARDWARE / OS YOU ARE RUNNING
@@ -91,13 +91,11 @@
# STEP 7: CHOOSE ANY OPTIMIZATIONS OR ADD ANY SPECIAL INCLUSIONS
# ------------------------------------------------------------
-CFLAGS = -O2 -I/usr/local/X11/include -I/usr/demo/SOUND/ -I./. $(AUDIODEF) $(OS)
# STEP 8: ADD ANY SPECIAL LIBRARY PATHS
# (USEFUL TO POINT TO WHERE THE MESA LIBRARIES RESIDE)
# ------------------------------------------------------------
-LIBFLAGS =
# you should now be able to type 'make' and everything should be fine ...
@@ -106,15 +104,16 @@
TARGET = battalion
OBJ = battalion.o audio.o net.o gprim.o graphics.o objects.o text.o update.o tk.o font.o soundIt.o
-LIBS = -L./. -L/usr/X11R6/lib -lm -lX11 -lXext
+my_CPPFLAGS = -lm `pkg-config --cflags x11` `pkg-config --cflags xext` -I./. $(AUDIODEF) $(OS)
+my_LIBS = -lm `pkg-config --libs x11` `pkg-config --libs xext`
all: $(TARGET)
-#$(OBJ): $(?:.o=.c)
-# $(CC) $(CFLAGS) $(LIBFLAG) $(OS) $(WHICHLIB) $(AUDIOLIB) -c $?
+.c.o:
+ $(CC) $(CPPFLAGS) $(my_CPPFLAGS) $(CFLAGS) $(GLIB_CFLAGS) $(OS) $(WHICHLIB) $(AUDIOLIB) -c $<
$(TARGET): $(OBJ)
- $(CC) -o $(TARGET) $(OBJ) $(LIBFLAGS) $(GLIB) $(LIBS) $(AUDIODEF)
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(GLIB_LIBS) $(LIBS) $(my_LIBS) $(AUDIODEF)
clean:
rm -f $(OBJ)
|
GitWeb
