Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7)

Side by Side Diff: examples/games/nethack-3.4.3/nacl-nethack-3.4.3.patch

Issue 11885025: Allow re-targeting of naclports install (Closed) Base URL: http://naclports.googlecode.com/svn/trunk/src
Patch Set: rebase Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 --- nethack-3.4.3-orig/win/tty/termcap.c 2003-12-07 15:39:13.000000000 -0 800 1 --- nethack-3.4.3-orig/win/tty/termcap.c 2003-12-07 15:39:13.000000000 -0 800
2 +++ nethack-3.4.3/win/tty/termcap.c 2011-09-27 13:38:17.000000000 -0700 2 +++ nethack-3.4.3/win/tty/termcap.c 2011-09-27 13:38:17.000000000 -0700
3 @@ -836,10 +836,6 @@ 3 @@ -836,10 +836,6 @@
4 4
5 #include <curses.h> 5 #include <curses.h>
6 6
7 -#ifndef LINUX 7 -#ifndef LINUX
8 -extern char *tparm(); 8 -extern char *tparm();
9 -#endif 9 -#endif
10 - 10 -
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 +LINK=$(CXX) 250 +LINK=$(CXX)
251 251
252 # Pick the SYSSRC and SYSOBJ lines corresponding to your desired operating 252 # Pick the SYSSRC and SYSOBJ lines corresponding to your desired operating
253 # system. 253 # system.
254 @@ -151,14 +151,14 @@ 254 @@ -151,14 +151,14 @@
255 # flags for debugging: 255 # flags for debugging:
256 # CFLAGS = -g -I../include 256 # CFLAGS = -g -I../include
257 257
258 -CFLAGS = -O -I../include 258 -CFLAGS = -O -I../include
259 -LFLAGS = 259 -LFLAGS =
260 +CFLAGS := $(NACL_CCFLAGS) -I../include -I$(NACL_SDK_USR_INCLUDE)/ncurses 260 +CFLAGS := $(NACL_CCFLAGS) -I../include -I$(NACLPORTS_INCLUDE)/ncurses
261 +LFLAGS = $(NACL_LDFLAGS) 261 +LFLAGS = $(NACL_LDFLAGS)
262 262
263 # The Qt and Be window systems are written in C++, while the rest of 263 # The Qt and Be window systems are written in C++, while the rest of
264 # NetHack is standard C. If using Qt, uncomment the LINK line here to get 264 # NetHack is standard C. If using Qt, uncomment the LINK line here to get
265 # the C++ libraries linked in. 265 # the C++ libraries linked in.
266 CXXFLAGS = $(CFLAGS) -I. -I$(QTDIR)/include 266 CXXFLAGS = $(CFLAGS) -I. -I$(QTDIR)/include
267 -CXX=g++ 267 -CXX=g++
268 +#CXX=g++ 268 +#CXX=g++
269 #LINK=g++ 269 #LINK=g++
270 # For cross-compiling, eg. with gcc on Linux (see also CC further up): 270 # For cross-compiling, eg. with gcc on Linux (see also CC further up):
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
375 --- nethack-3.4.3-orig/win/tty/termcap.c 2003-12-07 15:39:14.000000000 -0 800 375 --- nethack-3.4.3-orig/win/tty/termcap.c 2003-12-07 15:39:14.000000000 -0 800
376 +++ nethack-3.4.3/win/tty/termcap.c 2011-09-27 13:38:17.000000000 -0700 376 +++ nethack-3.4.3/win/tty/termcap.c 2011-09-27 13:38:17.000000000 -0700
377 @@ -108,6 +108,7 @@ 377 @@ -108,6 +108,7 @@
378 # if defined(TOS) && defined(__GNUC__) 378 # if defined(TOS) && defined(__GNUC__)
379 if (!term) 379 if (!term)
380 term = "builtin"; /* library has a default */ 380 term = "builtin"; /* library has a default */
381 +} 381 +}
382 # endif 382 # endif
383 if (!term) 383 if (!term)
384 #endif 384 #endif
OLDNEW
« no previous file with comments | « examples/audio/openal-ogg/nacl-openal-ogg.sh ('k') | examples/games/nethack-3.4.3/nacl-nethack-3.4.3.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698