blob: ca37cc743b69570532b045a897617114267768ac (
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
|
--- src/unix/unix.mak.orig Mon Mar 18 02:41:37 2002
+++ src/unix/unix.mak Tue Mar 19 18:05:20 2002
@@ -50,20 +50,20 @@
# svga and ggi also use $(X11LIB) since that's where zlib often is
LIBS.x11 = $(X11LIB) $(JOY_X11_LIBS) $(XINPUT_DEVICES_LIBS) -lX11 -lXext
-LIBS.svgalib = $(X11LIB) -lvga -lvgagl
+LIBS.svgalib = -L$(LOCALBASE)/lib -lvga -lvgagl
LIBS.ggi = $(X11LIB) -lggi
-LIBS.xgl = $(X11LIB) $(JOY_X11_LIBS) -lX11 -lXext $(GLLIBS) -ljpeg
+LIBS.xgl = $(X11LIB) $(JOY_X11_LIBS) -lX11 -lXext $(GLLIBS) -L$(LOCALBASE)/lib -ljpeg
LIBS.xfx = $(X11LIB) $(JOY_X11_LIBS) -lX11 -lXext -lglide2x
LIBS.svgafx = $(X11LIB) -lvga -lvgagl -lglide2x
LIBS.openstep = -framework AppKit
-LIBS.SDL = `sdl-config --libs`
+LIBS.SDL = `$(SDL_CONFIG) --libs`
LIBS.photon2 = -L/usr/lib -lph -lphrender
CFLAGS.x11 = $(X11INC) $(JOY_X11_CFLAGS) $(XINPUT_DEVICES_CFLAGS)
-CFLAGS.xgl = $(X11INC) $(JOY_X11_CFLAGS) $(GLCFLAGS)
+CFLAGS.xgl = -DGLU_VERSION_1_2 $(X11INC) $(JOY_X11_CFLAGS) $(GLCFLAGS) -I$(LOCALBASE)/include $(PTHREAD_CFLAGS)
CFLAGS.xfx = $(X11INC) $(JOY_X11_CFLAGS) -I/usr/include/glide
CFLAGS.svgafx = -I/usr/include/glide
-CFLAGS.SDL = -D_REENTRANT
+CFLAGS.SDL = $(X11INC) `$(SDL_CONFIG) --cflags`
CFLAGS.photon2 =
INST.x11 = doinstall
@@ -357,7 +357,7 @@
doc/x$(TARGET)rc.dist: all src/unix/xmamerc-keybinding-notes.txt
./x$(TARGET).$(DISPLAY_METHOD) -noloadconfig -showconfig | \
- grep -v loadconfig > doc/x$(TARGET)rc.dist
+ grep -v loadconfig | tr "\033" \# > doc/x$(TARGET)rc.dist
cat src/unix/xmamerc-keybinding-notes.txt >> doc/x$(TARGET)rc.dist
doc/gamelist.$(TARGET): all
@@ -366,7 +366,8 @@
doc/x$(TARGET).6: all src/unix/xmame.6-1 src/unix/xmame.6-3
cat src/unix/xmame.6-1 > doc/x$(TARGET).6
- ./x$(TARGET).$(DISPLAY_METHOD) -manhelp >> doc/x$(TARGET).6
+ ./x$(TARGET).$(DISPLAY_METHOD) -noloadconfig -manhelp | \
+ tr "\033" \# >> doc/x$(TARGET).6
cat src/unix/xmame.6-3 >> doc/x$(TARGET).6
install: $(INST.$(DISPLAY_METHOD)) install-man
|
