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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: libraries/OpenSceneGraph-2.9.7/nacl-OpenSceneGraph-2.9.7.patch

Issue 11885025: Allow re-targeting of naclports install (Closed) Base URL: http://naclports.googlecode.com/svn/trunk/src
Patch Set: 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 side-by-side diff with in-line comments
Download patch
« examples/games/nethack-3.4.3/nacl-nethack-3.4.3.sh ('K') | « libraries/Mesa-7.6/nacl-Mesa-7.6.sh ('k') | libraries/OpenSceneGraph-2.9.7/nacl-OpenSceneGraph-2.9.7.sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: libraries/OpenSceneGraph-2.9.7/nacl-OpenSceneGraph-2.9.7.patch
diff --git a/libraries/OpenSceneGraph-2.9.7/nacl-OpenSceneGraph-2.9.7.patch b/libraries/OpenSceneGraph-2.9.7/nacl-OpenSceneGraph-2.9.7.patch
index 40ecd3f4e097860f8ba19ddb3a8308b79dd97e49..9b272b0811571139bf298c945391ea7f607fed96 100644
--- a/libraries/OpenSceneGraph-2.9.7/nacl-OpenSceneGraph-2.9.7.patch
+++ b/libraries/OpenSceneGraph-2.9.7/nacl-OpenSceneGraph-2.9.7.patch
@@ -6,7 +6,7 @@ diff -Naur OpenSceneGraph-2.9.7/Makefile OpenSceneGraph-2.9.7.nacl/Makefile
+
+.PHONY: all clean
+
-+NACL_SDK_USR_INCLUDE = ../../../toolchain/$(OS_PREFIX)_x86/nacl/usr/include
++NACLPORTS_INCLUDE = ../../../toolchain/$(OS_PREFIX)_x86/nacl/usr/include
+
+all:
+ cd src/osg && $(MAKE) all
@@ -172,11 +172,11 @@ diff -Naur OpenSceneGraph-2.9.7/src/OpenThreads/Makefile OpenSceneGraph-2.9.7.na
+
+INCLUDE = -I$(OSG_ROOT)/include
+
-+NACL_SDK_USR = ../../../../../toolchain/$(OS_PREFIX)_x86/nacl/usr
++NACL_PORTS_PREFIX = ../../../../../toolchain/$(OS_PREFIX)_x86/nacl/usr
+
-+NACL_SDK_USR_INCLUDE = $(NACL_SDK_USR)/include
++NACLPORTS_INCLUDE = $(NACL_PORTS_PREFIX)/include
+
-+NACL_SDK_USR_LIB = $(NACL_SDK_USR)/lib
++NACLPORTS_LIBDIR = $(NACL_PORTS_PREFIX)/lib
+
+INCLUDE = -I$(OSG_ROOT)/include
+
@@ -1050,11 +1050,11 @@ diff -Naur OpenSceneGraph-2.9.7/src/osg/Makefile OpenSceneGraph-2.9.7.nacl/src/o
@@ -0,0 +1,161 @@
+OSG_ROOT = ../..
+
-+NACL_SDK_USR = ../../../../../toolchain/$(OS_PREFIX)_x86/nacl/usr
++NACL_PORTS_PREFIX = ../../../../../toolchain/$(OS_PREFIX)_x86/nacl/usr
+
-+NACL_SDK_USR_INCLUDE = $(NACL_SDK_USR)/include
++NACLPORTS_INCLUDE = $(NACL_PORTS_PREFIX)/include
+
-+NACL_SDK_USR_LIB = $(NACL_SDK_USR)/lib
++NACLPORTS_LIBDIR = $(NACL_PORTS_PREFIX)/lib
+
+INCLUDE = -I$(OSG_ROOT)/include
+
@@ -1238,11 +1238,11 @@ diff -Naur OpenSceneGraph-2.9.7/src/osgUtil/Makefile OpenSceneGraph-2.9.7.nacl/s
@@ -0,0 +1,66 @@
+OSG_ROOT = ../..
+
-+NACL_SDK_USR = ../../../../../toolchain/$(OS_PREFIX)_x86/nacl/usr
++NACL_PORTS_PREFIX = ../../../../../toolchain/$(OS_PREFIX)_x86/nacl/usr
+
-+NACL_SDK_USR_INCLUDE = $(NACL_SDK_USR)/include
++NACLPORTS_INCLUDE = $(NACL_PORTS_PREFIX)/include
+
-+NACL_SDK_USR_LIB = $(NACL_SDK_USR)/lib
++NACLPORTS_LIBDIR = $(NACL_PORTS_PREFIX)/lib
+
+INCLUDE = -I$(OSG_ROOT)/include
+
« examples/games/nethack-3.4.3/nacl-nethack-3.4.3.sh ('K') | « libraries/Mesa-7.6/nacl-Mesa-7.6.sh ('k') | libraries/OpenSceneGraph-2.9.7/nacl-OpenSceneGraph-2.9.7.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698