|
Line
Link Here
|
| 0 |
-- elc/new_update.c |
0 |
++ elc/new_update.c |
|
Lines 5-12
Link Here
|
| 5 |
#include <string.h> |
5 |
#include <string.h> |
| 6 |
#include "md5.h" |
6 |
#include "md5.h" |
| 7 |
#include "elc_private.h" |
7 |
#include "elc_private.h" |
| 8 |
#include "io/zip.h" |
8 |
#include <zip.h> |
| 9 |
#include "io/unzip.h" |
9 |
#include <unzip.h> |
| 10 |
#include "io/ziputil.h" |
10 |
#include "io/ziputil.h" |
| 11 |
#include "io/fileutil.h" |
11 |
#include "io/fileutil.h" |
| 12 |
#include "io/elfilewrapper.h" |
12 |
#include "io/elfilewrapper.h" |
| 13 |
-- elc/io/ziputil.h |
13 |
++ elc/io/ziputil.h |
|
Lines 8-15
Link Here
|
| 8 |
|
8 |
|
| 9 |
#include <SDL.h> |
9 |
#include <SDL.h> |
| 10 |
#include "../md5.h" |
10 |
#include "../md5.h" |
| 11 |
#include "zip.h" |
11 |
#include <zip.h> |
| 12 |
#include "unzip.h" |
12 |
#include <unzip.h> |
| 13 |
|
13 |
|
| 14 |
#ifdef __cplusplus |
14 |
#ifdef __cplusplus |
| 15 |
extern "C" |
15 |
extern "C" |
| 16 |
-- elc/io/elfilewrapper.c |
16 |
++ elc/io/elfilewrapper.c |
|
Lines 1-5
Link Here
|
| 1 |
#include "elfilewrapper.h" |
1 |
#include "elfilewrapper.h" |
| 2 |
#include "unzip.h" |
2 |
#include <unzip.h> |
| 3 |
#include "elpathwrapper.h" |
3 |
#include "elpathwrapper.h" |
| 4 |
#include "fileutil.h" |
4 |
#include "fileutil.h" |
| 5 |
#include <sys/stat.h> |
5 |
#include <sys/stat.h> |
| 6 |
-- elc/Makefile.linux |
6 |
++ elc/Makefile.linux |
|
Lines 25-35
Link Here
|
| 25 |
|
25 |
|
| 26 |
CFLAGS += $(shell sdl-config --cflags) \ |
26 |
CFLAGS += $(shell sdl-config --cflags) \ |
| 27 |
$(shell xml2-config --cflags) \ |
27 |
$(shell xml2-config --cflags) \ |
|
|
28 |
$(shell pkg-config --cflags minizip) \ |
| 28 |
-fno-strict-aliasing \ |
29 |
-fno-strict-aliasing \ |
| 29 |
$(EXTRA_INCLUDES) |
30 |
$(EXTRA_INCLUDES) |
| 30 |
|
31 |
|
| 31 |
CXXFLAGS += $(shell sdl-config --cflags) \ |
32 |
CXXFLAGS += $(shell sdl-config --cflags) \ |
| 32 |
$(shell xml2-config --cflags) \ |
33 |
$(shell xml2-config --cflags) \ |
|
|
34 |
$(shell pkg-config --cflags minizip) \ |
| 33 |
-fno-strict-aliasing \ |
35 |
-fno-strict-aliasing \ |
| 34 |
$(EXTRA_INCLUDES) |
36 |
$(EXTRA_INCLUDES) |
| 35 |
|
37 |
|
|
Lines 47-52
Link Here
|
| 47 |
$(shell pkg-config --libs vorbis) \ |
49 |
$(shell pkg-config --libs vorbis) \ |
| 48 |
$(shell pkg-config --libs vorbisfile) \ |
50 |
$(shell pkg-config --libs vorbisfile) \ |
| 49 |
$(shell pkg-config --libs zlib) \ |
51 |
$(shell pkg-config --libs zlib) \ |
|
|
52 |
$(shell pkg-config --libs minizip) \ |
| 50 |
-lm \ |
53 |
-lm \ |
| 51 |
$(EXTRA_LIBS) \ |
54 |
$(EXTRA_LIBS) \ |
| 52 |
$(foreach FEATURE, $(EL_FEATURES), $($(FEATURE)_LIBS)) \ |
55 |
$(foreach FEATURE, $(EL_FEATURES), $($(FEATURE)_LIBS)) \ |
|
Lines 80-86
Link Here
|
| 80 |
gamewin.o gl_init.o hud.o help.o highlight.o \ |
83 |
gamewin.o gl_init.o hud.o help.o highlight.o \ |
| 81 |
ignore.o init.o interface.o items.o io/fileutil.o \ |
84 |
ignore.o init.o interface.o items.o io/fileutil.o \ |
| 82 |
io/e3d_io.o io/elc_io.o io/map_io.o io/elpathwrapper.o io/xmlcallbacks.o \ |
85 |
io/e3d_io.o io/elc_io.o io/map_io.o io/elpathwrapper.o io/xmlcallbacks.o \ |
| 83 |
io/half.o io/normal.o io/elfilewrapper.o io/unzip.o io/ioapi.o io/zip.o io/ziputil.o \ |
86 |
io/half.o io/normal.o io/elfilewrapper.o io/ziputil.o \ |
| 84 |
keys.o knowledge.o langselwin.o lights.o list.o load_gl_extensions.o loginwin.o loading_win.o \ |
87 |
keys.o knowledge.o langselwin.o lights.o list.o load_gl_extensions.o loginwin.o loading_win.o \ |
| 85 |
main.o manufacture.o map.o mapwin.o memory.o \ |
88 |
main.o manufacture.o map.o mapwin.o memory.o \ |
| 86 |
md5.o mines.o minimap.o misc.o missiles.o multiplayer.o \ |
89 |
md5.o mines.o minimap.o misc.o missiles.o multiplayer.o \ |
