|
Line
Link Here
|
| 0 |
-- openarena-engine-source-0.8.8/Makefile |
0 |
++ openarena-engine-source-0.8.8/Makefile |
|
Lines 73-78
Link Here
|
| 73 |
|
73 |
|
| 74 |
ifndef ARCH |
74 |
ifndef ARCH |
| 75 |
ARCH=$(COMPILE_ARCH) |
75 |
ARCH=$(COMPILE_ARCH) |
|
|
76 |
else |
| 77 |
ifeq ($(ARCH),amd64) |
| 78 |
ARCH=x86_64 |
| 79 |
endif |
| 76 |
endif |
80 |
endif |
| 77 |
export ARCH |
81 |
export ARCH |
| 78 |
|
82 |
|
|
Lines 263-270
Link Here
|
| 263 |
endif |
267 |
endif |
| 264 |
endif |
268 |
endif |
| 265 |
|
269 |
|
| 266 |
BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \ |
270 |
BASE_CFLAGS = -fno-strict-aliasing -DUSE_ICON -I. |
| 267 |
-pipe -DUSE_ICON |
|
|
| 268 |
CLIENT_CFLAGS = $(SDL_CFLAGS) |
271 |
CLIENT_CFLAGS = $(SDL_CFLAGS) |
| 269 |
SERVER_CFLAGS = |
272 |
SERVER_CFLAGS = |
| 270 |
|
273 |
|
|
Lines 335-341
Link Here
|
| 335 |
THREAD_LIBS=-lpthread |
338 |
THREAD_LIBS=-lpthread |
| 336 |
LIBS=-ldl -lm |
339 |
LIBS=-ldl -lm |
| 337 |
|
340 |
|
| 338 |
CLIENT_LIBS=$(SDL_LIBS) -lGL |
341 |
CLIENT_LIBS=$(SDL_LIBS) -lGL -ljpeg |
| 339 |
|
342 |
|
| 340 |
ifeq ($(USE_OPENAL),1) |
343 |
ifeq ($(USE_OPENAL),1) |
| 341 |
ifneq ($(USE_OPENAL_DLOPEN),1) |
344 |
ifneq ($(USE_OPENAL_DLOPEN),1) |
