summaryrefslogtreecommitdiff
path: root/emulators/stella/patches/patch-ab
blob: d2f465620f17b13af32a38bf3378e300cf757f54 (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
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
$NetBSD: patch-ab,v 1.2 2004/06/05 11:56:31 dillo Exp $

--- makefile.orig	2003-02-18 02:19:44.000000000 +0100
+++ makefile
@@ -43,7 +43,7 @@ OPTIMIZATIONS    = -O2 -Wall -Wno-unused
 ### comment out all lines to completely disable sound
 ###
 #SOUND_ALSA = 1
-SOUND_OSS  = 1
+#SOUND_OSS  = 1
 #SOUND_SDL  = 1
 
 ### if your C++ compiler doesn't support the bool type
@@ -61,7 +61,7 @@ SOUND_OSS  = 1
 ### to include support for saving snapshots in png format
 ### (requires PNG library)
 ### Only X11 and SDL ports supported for now
-# SNAPSHOT_SUPPORT = 1
+SNAPSHOT_SUPPORT = 1
 
 ### comment this out if your system doesn't
 ### have the gettimeofday function
@@ -72,23 +72,26 @@ HAVE_GETTIMEOFDAY = 1
 ### enables some extra commandline options that allow the user
 ### to override some emulation defaults
 ### Only X11 and SDL ports supported for now
-# DEVELOPER_SUPPORT = 1
+DEVELOPER_SUPPORT = 1
 
 ##============================================================================
 ## All done, type make to get a list of frontends
 ## No configurable options below this line ...
 ##============================================================================
 
-CXX	= g++
-LD	= g++
+#CXX	= g++
+#LD	= g++
 
-LDFLAGS = 
+#LDFLAGS = 
 LDLIBS	= 
 
+CFLAGS+=	-DPKG_SYSCONFDIR=\"${PKG_SYSCONFDIR}\" \
+		-DDATADIR=\"${PREFIX}/share/stella\"
+
 OBJS.X11   =
 OPTS.X11   =
-LIBS.X11   =
-CFLAGS.X11 =
+LIBS.X11   = 
+CFLAGS.X11 = 
 
 OBJS.SDL   =
 OPTS.SDL   =
@@ -152,8 +155,11 @@ endif
 ifeq ($(SOUND_OSS), 1)
   OPTS.X11 += -DSOUND_OSS=1
   OBJS.X11 += SoundOSS.o
+  LIBS.X11 += ${LIBOSSAUDIO}
   OPTS.SDL += -DSOUND_OSS=1
   OBJS.SDL += SoundOSS.o
+  LIBS.SDL += ${LIBOSSAUDIO}
+  CFLAGS   += -DDSP_DEVICE=\"${DEVOSSSOUND}\"
 endif
 
 ifeq ($(SOUND_SDL), 1)
@@ -207,11 +213,10 @@ unix-x:
           SYS_INCLUDES="" \
           OPTIONS="-DBSPF_UNIX=1" \
           OPTIONS+="$(OPTS.X11)" \
-          LDFLAGS="-L/usr/X11R6/lib" \
-          LDFLAGS+="$(CFLAGS.X11)" \
+          CFLAGS+="$(CFLAGS.X11)" \
           LDLIBS="-lX11 -lXext" \
           LDLIBS+="$(LIBS.X11)" \
-          OBJS="mainX11.o"
+          OBJS="mainX11.o" \
           OBJS+="$(OBJS.X11)"
 
 linux-x:
@@ -233,9 +238,7 @@ linux-sdl:
           SYS_INCLUDES="" \
           OPTIONS="-DBSPF_UNIX=1" \
           OPTIONS+="$(OPTS.SDL)" \
-          LDFLAGS="-L/usr/X11R6/lib" \
-          LDFLAGS+="$(CFLAGS.SDL)" \
-          LDLIBS="-lX11 -lXext" \
+          CFLAGS+="$(CFLAGS.SDL)" \
           LDLIBS+="$(LIBS.SDL)" \
           OBJS="mainSDL.o RectList.o" \
           OBJS+="$(OBJS.SDL)"
@@ -290,10 +293,10 @@ stella.exe: $(CORE_OBJS) $(OBJS)
 	del a.exe
 
 stella.x11: $(CORE_OBJS) $(OBJS)
-	$(LD) -o stella.x11 $(CORE_OBJS) $(OBJS) $(LDFLAGS) $(LDLIBS)
+	$(CXX) -o stella.x11 $(CORE_OBJS) $(OBJS) $(LDFLAGS) $(LDLIBS)
 
 stella.sdl: $(CORE_OBJS) $(OBJS)
-	$(LD) -o stella.sdl $(CORE_OBJS) $(OBJS) $(LDFLAGS) $(LDLIBS)
+	$(CXX) -o stella.sdl $(CORE_OBJS) $(OBJS) $(LDFLAGS) $(LDLIBS)
 
 M6502Low.ins: $(CORE)/m6502/src/M6502Low.m4 $(CORE)/m6502/src/M6502.m4
 	m4 $(CORE)/m6502/src/M6502Low.m4 $(CORE)/m6502/src/M6502.m4 > M6502Low.ins
@@ -422,7 +425,7 @@ Random.o: $(CORE)/Random.cxx
 	$(CXX) -c $(CXXFLAGS) $(OPTIONS) $(CORE)/Random.cxx
 
 Sound.o: $(CORE)/Sound.cxx $(CORE)/Sound.hxx
-	$(CXX) -c $(CXXFLAGS) $(OPTIONS) $(LDFLAGS) $(CORE)/Sound.cxx
+	$(CXX) -c $(CXXFLAGS) $(OPTIONS) $(CFLAGS) $(CORE)/Sound.cxx
 
 Switches.o: $(CORE)/Switches.cxx
 	$(CXX) -c $(CXXFLAGS) $(OPTIONS) $(CORE)/Switches.cxx
@@ -434,7 +437,7 @@ Deserializer.o: $(CORE)/Deserializer.cxx
 	$(CXX) -c $(CXXFLAGS) $(OPTIONS) $(CORE)/Deserializer.cxx
 
 Settings.o: $(UI)/common/Settings.cxx $(UI)/common/Settings.hxx
-	$(CXX) -c $(CXXFLAGS) $(OPTIONS) $(LDFLAGS) $(UI)/common/Settings.cxx
+	$(CXX) -c $(CXXFLAGS) $(OPTIONS) $(CFLAGS) $(UI)/common/Settings.cxx
 
 Terminal.o: $(UI)/x11/Terminal.cxx
 	$(CXX) -c $(CXXFLAGS) $(OPTIONS) $(UI)/x11/Terminal.cxx
@@ -455,28 +458,28 @@ vga.o: $(UI)/dos/vga.cxx
 	$(CXX) -c $(CXXFLAGS) $(OPTIONS) $(UI)/dos/vga.cxx
 
 SoundALSA.o: $(UI)/sound/SoundALSA.cxx $(UI)/sound/SoundALSA.hxx
-	$(CXX) -c $(CXXFLAGS) $(OPTIONS) $(LDFLAGS) $(UI)/sound/SoundALSA.cxx
+	$(CXX) -c $(CXXFLAGS) $(OPTIONS) $(CFLAGS) $(UI)/sound/SoundALSA.cxx
 
 SoundOSS.o: $(UI)/sound/SoundOSS.cxx $(UI)/sound/SoundOSS.hxx
-	$(CXX) -c $(CXXFLAGS) $(OPTIONS) $(LDFLAGS) $(UI)/sound/SoundOSS.cxx
+	$(CXX) -c $(CXXFLAGS) $(OPTIONS) $(CFLAGS) $(UI)/sound/SoundOSS.cxx
 
 SoundSDL.o: $(UI)/sound/SoundSDL.cxx $(UI)/sound/SoundSDL.hxx
-	$(CXX) -c $(CXXFLAGS) $(OPTIONS) $(LDFLAGS) $(UI)/sound/SoundSDL.cxx
+	$(CXX) -c $(CXXFLAGS) $(OPTIONS) $(CFLAGS) $(UI)/sound/SoundSDL.cxx
 
 TermX11.o: $(UI)/x11/TermX11.cxx
 	$(CXX) -c $(CXXFLAGS) $(OPTIONS) $(UI)/x11/TermX11.cxx
 
 mainX11.o: $(UI)/x11/mainX11.cxx
-	$(CXX) -c $(CXXFLAGS) $(OPTIONS) $(LDFLAGS) $(UI)/x11/mainX11.cxx
+	$(CXX) -c $(CXXFLAGS) $(OPTIONS) $(CFLAGS) $(UI)/x11/mainX11.cxx
 
 mainSDL.o: $(UI)/sdl/mainSDL.cxx
-	$(CXX) -c $(CXXFLAGS) $(OPTIONS) $(LDFLAGS) $(UI)/sdl/mainSDL.cxx
+	$(CXX) -c $(CXXFLAGS) $(OPTIONS) $(CFLAGS) $(UI)/sdl/mainSDL.cxx
 
 RectList.o: $(UI)/sdl/RectList.cxx $(UI)/sdl/RectList.hxx
-	$(CXX) -c $(CXXFLAGS) $(OPTIONS) $(LDFLAGS) $(UI)/sdl/RectList.cxx
+	$(CXX) -c $(CXXFLAGS) $(OPTIONS) $(CFLAGS) $(UI)/sdl/RectList.cxx
 
 Snapshot.o: $(UI)/common/Snapshot.cxx $(UI)/common/Snapshot.hxx
-	$(CXX) -c $(CXXFLAGS) $(OPTIONS) $(LDFLAGS) $(UI)/common/Snapshot.cxx
+	$(CXX) -c $(CXXFLAGS) $(OPTIONS) $(CFLAGS) $(UI)/common/Snapshot.cxx
 
 D6502.o: $(CORE)/m6502/src/D6502.cxx
 	$(CXX) -c $(CXXFLAGS) $(OPTIONS) $(CORE)/m6502/src/D6502.cxx