OLD | NEW |
1 diff --git a/Quake/Makefile b/Quake/Makefile | 1 diff --git a/Quake/Makefile b/Quake/Makefile |
2 --- a/Quake/Makefile | 2 --- a/Quake/Makefile |
3 +++ b/Quake/Makefile | 3 +++ b/Quake/Makefile |
4 @@ -14,7 +14,7 @@ USE_CODEC_MP3=1 | 4 @@ -14,7 +14,7 @@ USE_CODEC_MP3=1 |
5 USE_CODEC_VORBIS=1 | 5 USE_CODEC_VORBIS=1 |
6 | 6 |
7 # which library to use for mp3 decoding: mad or mpg123 | 7 # which library to use for mp3 decoding: mad or mpg123 |
8 -MP3LIB=mad | 8 -MP3LIB=mad |
9 +MP3LIB=mpg123 | 9 +MP3LIB=mpg123 |
10 # which library to use for ogg decoding: vorbis or tremor | 10 # which library to use for ogg decoding: vorbis or tremor |
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
106 # --------------------------- | 106 # --------------------------- |
107 # rules | 107 # rules |
108 # --------------------------- | 108 # --------------------------- |
109 | 109 |
110 %.o: %.c | 110 %.o: %.c |
111 - $(CC) $(DFLAGS) -c $(CFLAGS) $(SDL_CFLAGS) -o $@ $^ | 111 - $(CC) $(DFLAGS) -c $(CFLAGS) $(SDL_CFLAGS) -o $@ $^ |
112 + $(RUN_CC)$(CC) $(DFLAGS) -c $(CPPFLAGS) $(CFLAGS) $(SDL_CFLAGS) -o $@ $^ | 112 + $(RUN_CC)$(CC) $(DFLAGS) -c $(CPPFLAGS) $(CFLAGS) $(SDL_CFLAGS) -o $@ $^ |
113 | 113 |
114 # ---------------------------------------------------------------------------- | 114 # ---------------------------------------------------------------------------- |
115 # objects | 115 # objects |
116 @@ -254,11 +265,11 @@ OBJS := strlcat.o \ | 116 @@ -254,11 +265,13 @@ OBJS := strlcat.o \ |
117 # Linux build rules | 117 # Linux build rules |
118 # ------------------------ | 118 # ------------------------ |
119 | 119 |
120 -quakespasm: $(OBJS) | 120 -quakespasm: $(OBJS) |
121 - $(LINKER) $(OBJS) $(LDFLAGS) $(LIBS) $(SDL_LIBS) -o $@ | 121 - $(LINKER) $(OBJS) $(LDFLAGS) $(LIBS) $(SDL_LIBS) -o $@ |
| 122 - $(call do_strip,$@) |
122 +quakespasm$(EXEEXT): $(OBJS) | 123 +quakespasm$(EXEEXT): $(OBJS) |
123 + $(RUN_CCLD)$(LINKER) $(OBJS) $(LDFLAGS) $(LIBS) $(SDL_LIBS) -o $@ | 124 + $(RUN_CCLD)$(LINKER) $(OBJS) $(LDFLAGS) $(LIBS) $(SDL_LIBS) -o $@ |
124 » $(call do_strip,$@) | 125 +» -if test $(NACL_ARCH) != le32; then \ |
| 126 +» » $(call do_strip,$@); \ |
| 127 +» fi |
125 | 128 |
126 -release: quakespasm | 129 -release: quakespasm |
127 +release: quakespasm$(EXEEXT) | 130 +release: quakespasm$(EXEEXT) |
128 debug: | 131 debug: |
129 $(error Use "make DEBUG=1") | 132 $(error Use "make DEBUG=1") |
130 | 133 |
131 diff --git a/Quake/arch_def.h b/Quake/arch_def.h | 134 diff --git a/Quake/arch_def.h b/Quake/arch_def.h |
132 --- a/Quake/arch_def.h | 135 --- a/Quake/arch_def.h |
133 +++ b/Quake/arch_def.h | 136 +++ b/Quake/arch_def.h |
134 @@ -77,6 +77,7 @@ | 137 @@ -77,6 +77,7 @@ |
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
229 --- a/Quake/sys_sdl_unix.c | 232 --- a/Quake/sys_sdl_unix.c |
230 +++ b/Quake/sys_sdl_unix.c | 233 +++ b/Quake/sys_sdl_unix.c |
231 @@ -27,6 +27,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 021
11-1307, USA. | 234 @@ -27,6 +27,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 021
11-1307, USA. |
232 #include <unistd.h> | 235 #include <unistd.h> |
233 #include <sys/stat.h> | 236 #include <sys/stat.h> |
234 #include <sys/time.h> | 237 #include <sys/time.h> |
235 +#include <sys/select.h> | 238 +#include <sys/select.h> |
236 #include <fcntl.h> | 239 #include <fcntl.h> |
237 #include <time.h> | 240 #include <time.h> |
238 | 241 |
OLD | NEW |