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

Unified Diff: nacltoons/game.mk

Issue 12472014: [nacltoons] Remove legacy nacl_mounts support. (Closed) Base URL: https://nativeclient-sdk.googlecode.com/svn/trunk/src
Patch Set: Created 7 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « DEPS ('k') | nacltoons/src/main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: nacltoons/game.mk
diff --git a/nacltoons/game.mk b/nacltoons/game.mk
index 2302c68751a9ad88e3b917c4ee4ab26fac7a5197..63af5aa500f2060773cabcd14aae17ceedc0054a 100644
--- a/nacltoons/game.mk
+++ b/nacltoons/game.mk
@@ -63,7 +63,7 @@ ifndef NACL_SDK_ROOT
$(error NACL_SDK_ROOT not set)
endif
-NACL_SDK_VERSION_MIN := 27.184438
+NACL_SDK_VERSION_MIN := 27.186236
include $(NACL_SDK_ROOT)/tools/common.mk
# In recent SDK versions defining NACL_SDK_VERSION_MIN is enough to trigger and error
@@ -74,9 +74,6 @@ ifndef SDK_VERSION
$(error You need a more recent version of the NaCl SDK (>= $(NACL_SDK_VERSION_MIN)))
endif
-ifdef NACL_MOUNTS
-CFLAGS += -DOLD_NACL_MOUNTS
-endif
CFLAGS += -DCOCOS2D_DEBUG -DCC_ENABLE_BOX2D_INTEGRATION
CFLAGS += -Wall -Wno-unknown-pragmas
@@ -124,12 +121,7 @@ LIB_PATHS += $(NACLPORTS_ROOT)/lib
DEPS=
SOUNDLIBS=cocosdenshion alut openal vorbisfile vorbis ogg
LIBS=$(DEPS) lua cocos2d $(SOUNDLIBS) freetype box2d xml2 png12 jpeg tiff webp
-ifdef NACL_MOUNTS
-LIBS+=nacl-mounts
-else
-LIBS+=nacl_io
-endif
-LIBS+=ppapi_gles2 ppapi ppapi_cpp z nosys
+LIBS+=nacl_io ppapi_gles2 ppapi ppapi_cpp z nosys
#
« no previous file with comments | « DEPS ('k') | nacltoons/src/main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698