      #endif
  #endif
  
+diff -Naur OpenSceneGraph-2.9.7/src/OpenThreads/.Makefile.swp OpenSceneGraph-2.9.7.nacl/src/OpenThreads/.Makefile.swp
+--- OpenSceneGraph-2.9.7/src/OpenThreads/.Makefile.swp	1969-12-31 17:00:00.000000000 -0700
++++ OpenSceneGraph-2.9.7.nacl/src/OpenThreads/.Makefile.swp	2010-07-01 17:22:07.000000000 -0600
+@@ -0,0 +1 @@
++b0VIM 7.1#-LHLsangadeadly-ninja.bld.corp.google.com/usr/local/google/home/sanga/wa/naclports/src/packages/repository/OpenSceneGraph-2.9.7/src/OpenThreads/Makefileutf-8
+3210#"! Utp+adF+++[Z32hNM?>&
+
+
+
+
+
+
+
+Z
+$
+#
++++v++#+	cd $(OBJ_DIR) && $(AR) rcs ../$(OSG_ROOT)/$(LIB_OPENTHREADS) $(COMMON_OBJ_FILES) $(PTHREADS_OBJ_FILES)$(LIB_OPENTHREADS): $(OBJ_DIR) $(COMMON_OBJ_FILES) $(PTHREADS_OBJ_FILES)	$(CXX) -c $(INCLUDE) $(CXXFLAGS) $< -o $(OBJ_DIR)/$@$(PTHREADS_OBJ_FILES): %.o: %.c++ $(OBJ_DIR)	$(CXX) -c $(INCLUDE) $(CXXFLAGS) $< -o $(OBJ_DIR)/$@$(COMMON_OBJ_FILES): %.o: %.cpp $(OBJ_DIR)	mkdir $(OBJ_DIR)/pthreads	mkdir $(OBJ_DIR)/common	mkdir $(OBJ_DIR)$(OBJ_DIR):	rm -rf $(OBJ_DIR) $(LIB_OPENTHREADS)clean:	@echo "Making libOpenThreads"all: $(LIB_OPENTHREADS)OBJ_DIR = obj		pthreads/PThreadMutex.o		pthreads/PThreadCondition.o \		pthreads/PThreadBarrier.o \		pthreads/PThread.o \PTHREADS_OBJ_FILES = \		common/Version.o		common/Atomic.o \COMMON_OBJ_FILES = \INCLUDE = -I$(OSG_ROOT)/includeNACL_SDK_USR_LIB = $(NACL_SDK_USR)/libNACL_SDK_USR_INCLUDE = $(NACL_SDK_USR)/includeNACL_SDK_USR = ../../../../../toolchain/$(OS_PREFIX)_x86/nacl/usrINCLUDE = -I$(OSG_ROOT)/includeOSG_ROOT = ../..
+\ No newline at end of file
 diff -Naur OpenSceneGraph-2.9.7/src/OpenThreads/Makefile OpenSceneGraph-2.9.7.nacl/src/OpenThreads/Makefile
 --- OpenSceneGraph-2.9.7/src/OpenThreads/Makefile	1969-12-31 17:00:00.000000000 -0700
-+++ OpenSceneGraph-2.9.7.nacl/src/OpenThreads/Makefile	2010-06-29 14:26:45.000000000 -0600
++++ OpenSceneGraph-2.9.7.nacl/src/OpenThreads/Makefile	2010-07-01 17:21:59.000000000 -0600
 @@ -0,0 +1,43 @@
 +OSG_ROOT = ../..
 +

 
diff -Naur OpenSceneGraph-2.9.7/src/OpenThreads/pthreads/PThreadPrivateData.h OpenSceneGraph-2.9.7.nacl/src/OpenThreads/pthreads/PThreadPrivateData.h
--- OpenSceneGraph-2.9.7/src/OpenThreads/pthreads/PThreadPrivateData.h	2007-09-25 03:45:44.000000000 -0600
+++ OpenSceneGraph-2.9.7.nacl/src/OpenThreads/pthreads/PThreadPrivateData.h	2010-06-29 14:26:45.000000000 -0600
@@ -25,6 +25,8 @@
 
 namespace OpenThreads {

+	$(CXX) -c $(INCLUDE) $(CXXFLAGS) $< -o $(OBJ_DIR)/$@
+
+$(LIB_OPENTHREADS): $(OBJ_DIR) $(COMMON_OBJ_FILES) $(PTHREADS_OBJ_FILES)
+	cd $(OBJ_DIR) && $(AR) rcs ../$(OSG_ROOT)/$(LIB_OPENTHREADS) $(COMMON_OBJ_FILES) $(PTHREADS_OBJ_FILES)
diff -Naur OpenSceneGraph-2.9.7/src/OpenThreads/common/Version.in OpenSceneGraph-2.9.7.nacl/src/OpenThreads/common/Version.in
--- OpenSceneGraph-2.9.7/src/OpenThreads/common/Version.in	1969-12-31 17:00:00.000000000 -0700
+++ OpenSceneGraph-2.9.7.nacl/src/OpenThreads/common/Version.in	2010-07-01 17:19:46.000000000 -0600
@@ -0,0 +1,38 @@
+/* -*-c++-*- OpenThreads library, Copyright (C) 2002 - 2007  The Open Thread Group
+ *
