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
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
|
--- ./Makefile.orig Fri Apr 7 13:48:24 2006
+++ ./Makefile Tue Aug 29 21:08:26 2006
@@ -5,54 +5,26 @@
# compilation tool and detection of targets/achitecture
-CC =gcc
CC_BASEVERSION =$(shell $(CC) -dumpversion | sed -e 's/\..*//g')
MACHINE =$(shell $(CC) -dumpmachine)
ARCH =$(shell echo $(MACHINE) | sed -e 's/.*mingw32.*/mingw32/g' -e 's/\-.*//g' -e 's/i.86/x86/g')
STRIP =strip --strip-unneeded --remove-section=.comment
-# Mac OSX Tiger : powerpc -> ppc
-ifeq ($(MACHINE),powerpc-apple-darwin8) # MacOS-10.4/ppc
- ARCH = ppc
-endif
-
-# Mac OSX Tiger : i686 -> macx86
-ifeq ($(MACHINE),i686-apple-darwin8) # MacOS-10.4/x86
- ARCH = macx86
- STRIP = strip
-endif
-
-# add special architecture based flags
-ifeq ($(ARCH),x86) # Linux/x86
- DEST_ARCH =x86
- ARCH_CFLAGS =-march=$(shell echo $(MACHINE) | sed -e 's/\-.*//g')
-endif
-ifeq ($(ARCH),mingw32) # Win32/x86 in MingW environment
- DEST_ARCH =x86
- ARCH_CFLAGS =-mwin32 -mno-cygwin
-endif
-ifeq ($(ARCH),ppc) # MacOS-X/ppc
- DEST_ARCH =ppc
- ARCH_CFLAGS =-arch ppc -faltivec -maltivec -mcpu=7450 -mtune=7450 -mpowerpc -mpowerpc-gfxopt
- ifeq ($(CC_BASEVERSION),4) # auto vectorize if we're using gcc4.0+
- ARCH_CFLAGS += -ftree-vectorize
- endif
-endif
-
-
#======================================================================
# Output Directories
#======================================================================
# location of source relative to Makefile
SOURCE_DIR =.
-BUILD_DEBUG_DIR =debug-$(ARCH)
-BUILD_RELEASE_DIR =release-$(ARCH)
+BUILD_DEBUG_DIR =debug
+BUILD_RELEASE_DIR =release
# compiler flags
PRJ_CFLAGS =-DWITH_ZLIB -DWITH_PNG -DEMBED_TCL -DUSE_TCL_STUBS
-XMMS_CFLAGS =-DWITH_XMMS `glib-config --cflags`
-BASE_CFLAGS =-Wall $(PRJ_CFLAGS) $(ARCH_CFLAGS)
+XMMS_CFLAGS =-DWITH_XMMS `xmms-config --cflags` `glib-config --cflags`
+BASE_CFLAGS =$(CFLAGS) -I$(LOCALBASE)/include `pcre-config --cflags` -I$(TCL_INCLUDEDIR) -DDATADIR='\"$(Q1DIR)\"' -Wall $(PRJ_CFLAGS) $(XMMS_CFLAGS)
+
+ifeq ($(USE_OPTIMIZED_CFLAGS),YES)
BASE_RELEASE_CFLAGS =-ffast-math -fomit-frame-pointer -fexpensive-optimizations
ifneq ($(CC_BASEVERSION),4) # if we're not auto-vectorizing then we can unroll the loops (mdfour ahoy)
BASE_RELEASE_CFLAGS += -funroll-loops
@@ -69,99 +41,47 @@
BASE_RELEASE_CFLAGS += -falign-loops=2 -falign-jumps=2 -falign-functions=2
endif
endif
+endif
+
BASE_DEBUG_CFLAGS =-g -D_DEBUG
-ifeq ($(ARCH),x86) # Linux/x86
- BASE_CFLAGS += -Did386 $(XMMS_CFLAGS)
- CL_DLFLAGS += -ldl
-endif
-ifeq ($(ARCH),mingw32) # Win32/x86 in MingW environment
- # use define for special assembly routines:
- BASE_CFLAGS += -Did386 -DMINGW32
-endif
-ifeq ($(ARCH),ppc) # MacOS-X/ppc
- BASE_CFLAGS += -D__BIG_ENDIAN__ -Ddarwin
-endif
-ifeq ($(ARCH),macx86) # MacOS-X/x86
- BASE_CFLAGS += -Ddarwin
-endif
-ifeq ($(ARCH),powerpc) # Linux/PPC
- BASE_CFLAGS += -D__BIG_ENDIAN__
- CL_DLFLAGS += -ldl
+ifeq ($(ARCH),i386)
+ ifeq ($(USE_X86_ASM),YES)
+ BASE_CFLAGS += -Did386
+ endif
endif
BASE_CFLAGS += -funsigned-char -pipe -fno-strict-aliasing
RELEASE_CFLAGS =$(BASE_CFLAGS) $(BASE_RELEASE_CFLAGS) -DNDEBUG
DEBUG_CFLAGS =$(BASE_CFLAGS) $(BASE_DEBUG_CFLAGS) -Wimplicit
-
# software and console (svga) builds
DO_CC =$(CC) -DWITH_VMODE $(CFLAGS) -o $@ -c $<
-ifeq ($(ARCH),mingw32) # Win32/x86 in MingW environment
- DO_CC += -D_WINDOWS -mwindows
-endif
DO_O_CC =$(CC) -O $(CFLAGS) -o $@ -c $<
DO_AS =$(CC) $(CFLAGS) -x assembler-with-cpp
-ifeq ($(ARCH),x86) # Linux/x86
- DO_AS += -DELF
-endif
+DO_AS += -DELF
DO_AS += -o $@ -c $<
# opengl builds
-BASE_GLCFLAGS =-DWITH_JPEG -DGLQUAKE
-ifeq ($(ARCH),x86) # Linux/x86
- ARCH_GLCFLAGS =-I/usr/include -DWITH_VMODE -DWITH_DGA -DWITH_EVDEV
-endif
-ifeq ($(ARCH),mingw32) # Win32/x86 in MingW environment
- ARCH_GLCFLAGS =-mwindows -I/opt/xmingw/include/ -I./pcre/ -I./libexpat/
-endif
-ifeq ($(ARCH),ppc) # MacOS-X/ppc
- ARCH_GLCFLAGS = -I/opt/local/include/ -I/Developer/Headers/FlatCarbon -I/sw/include -FOpenGL -FAGL
-endif
-ifeq ($(ARCH),macx86) # MacOS-X/x86
- ARCH_GLCFLAGS = -I/opt/local/include/ -I/Developer/Headers/FlatCarbon -I/sw/include -FOpenGL -FAGL `pcre-config --cflags` -I./libs
-endif
+BASE_GLCFLAGS =-DWITH_JPEG -DGLQUAKE -I$(X11BASE)/include
+ARCH_GLCFLAGS =-DWITH_VMODE -DWITH_DGA
GLCFLAGS =$(ARCH_GLCFLAGS) $(BASE_GLCFLAGS)
DO_GL_CC =$(CC) $(CFLAGS) $(GLCFLAGS) -o $@ -c $<
DO_GL_AS =$(CC) $(CFLAGS) $(GLCFLAGS) -x assembler-with-cpp
-ifeq ($(ARCH),x86) # Linux/x86
- DO_GL_AS += -DELF
-endif
+DO_GL_AS += -DELF
DO_GL_AS += -o $@ -c $<
-
# linker flags
-LDFLAGS =-lm `glib-config --libs` -lpthread -lexpat `pcre-config --libs` -ltclstub $(CL_DLFLAGS)
+LDFLAGS =-L$(LOCALBASE)/lib -lm `glib-config --libs` $(PTHREAD_LIBS) -lexpat `pcre-config --libs` -ltclstub$(TCL_SUFX) $(CL_DLFLAGS)
SVGALDFLAGS =-lvga
-X11_LDFLAGS =-L/usr/X11R6/lib -lX11 -lXext -lXxf86dga -lXxf86vm
-ifeq ($(ARCH),mingw32) # Win32/x86 in MingW environment
- LDFLAGS += -lws2_32 -luser32 -lwinmm
-endif
-ifeq ($(ARCH),ppc) # MacOS-X/ppc
- LDFLAGS =`pcre-config --libs` -lexpat -framework OpenGL -framework AGL -framework DrawSprocket -framework Carbon -framework ApplicationServices -framework IOKit
-endif
-ifeq ($(ARCH),macx86) # MacOS-X/x86
- LDFLAGS =`pcre-config --libs` -lexpat -framework OpenGL -framework AGL -framework DrawSprocket -framework Carbon -framework ApplicationServices -framework IOKit
-endif
+X11_LDFLAGS =-L$(X11BASE)/lib -lX11 -lXext -lXxf86dga -lXxf86vm
# opengl build
BASE_GL_LDFLAGS =-L/usr/X11R6/lib -lGL -lm -lX11 -lXext
ARCH_GL_LDFLAGS =
-ifeq ($(ARCH),x86) # Linux/x86
- ARCH_GL_LDFLAGS =-lXxf86dga -lXxf86vm
-endif
-ifeq ($(ARCH),mingw32) # Win32/x86 in MingW environment
- BASE_GL_LDFLAGS =
- ARCH_GL_LDFLAGS =-mwindows -lopengl32 -ldxguid -lgdi32
-endif
-ifeq ($(ARCH),ppc) # MacOS-X/ppc
- BASE_GL_LDFLAGS =
-endif
-ifeq ($(ARCH),macx86) # MacOS-X/x86
- BASE_GL_LDFLAGS =
-endif
+ARCH_GL_LDFLAGS =-lXxf86dga -lXxf86vm
GL_LDFLAGS =$(ARCH_GL_LDFLAGS) $(BASE_GL_LDFLAGS)
@@ -234,7 +154,6 @@
$(BUILDDIR)/build/snd_mix.o \
$(BUILDDIR)/build/snd_linux.o \
$(BUILDDIR)/build/snd_oss.o \
- $(BUILDDIR)/build/snd_alsa.o \
\
$(BUILDDIR)/build/cl_input.o \
$(BUILDDIR)/build/keys.o \
@@ -855,7 +774,6 @@
$(BUILDDIR)/build-gl/snd_mix.o \
$(BUILDDIR)/build-gl/snd_linux.o \
$(BUILDDIR)/build-gl/snd_oss.o \
- $(BUILDDIR)/build-gl/snd_alsa.o \
\
$(BUILDDIR)/build-gl/cl_input.o \
$(BUILDDIR)/build-gl/keys.o \
|
