OLD | NEW |
1 diff -Naur OpenSceneGraph-2.9.7/Makefile OpenSceneGraph-2.9.7.nacl/Makefile | 1 diff -Naur OpenSceneGraph-2.9.7/Makefile OpenSceneGraph-2.9.7.nacl/Makefile |
2 --- OpenSceneGraph-2.9.7/Makefile 1969-12-31 17:00:00.000000000 -0700 | 2 --- OpenSceneGraph-2.9.7/Makefile 1969-12-31 17:00:00.000000000 -0700 |
3 +++ OpenSceneGraph-2.9.7.nacl/Makefile 2010-07-01 17:33:14.000000000 -0600 | 3 +++ OpenSceneGraph-2.9.7.nacl/Makefile 2010-07-01 17:33:14.000000000 -0600 |
4 @@ -0,0 +1,17 @@ | 4 @@ -0,0 +1,17 @@ |
5 +export CXXFLAGS += -O3 | 5 +export CXXFLAGS += -O3 |
6 + | 6 + |
7 +.PHONY: all clean | 7 +.PHONY: all clean |
8 + | 8 + |
9 +NACL_SDK_USR_INCLUDE = ../../../toolchain/$(OS_PREFIX)_x86/nacl/usr/include | 9 +NACLPORTS_INCLUDE = ../../../toolchain/$(OS_PREFIX)_x86/nacl/usr/include |
10 + | 10 + |
11 +all: | 11 +all: |
12 + cd src/osg && $(MAKE) all | 12 + cd src/osg && $(MAKE) all |
13 + cd src/osgUtil && $(MAKE) all | 13 + cd src/osgUtil && $(MAKE) all |
14 + cd src/OpenThreads && $(MAKE) all | 14 + cd src/OpenThreads && $(MAKE) all |
15 + | 15 + |
16 +clean: | 16 +clean: |
17 + @echo Make clean | 17 + @echo Make clean |
18 + rm -f *.a | 18 + rm -f *.a |
19 + cd src/osg && $(MAKE) clean | 19 + cd src/osg && $(MAKE) clean |
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
165 #endif | 165 #endif |
166 | 166 |
167 diff -Naur OpenSceneGraph-2.9.7/src/OpenThreads/Makefile OpenSceneGraph-2.9.7.na
cl/src/OpenThreads/Makefile | 167 diff -Naur OpenSceneGraph-2.9.7/src/OpenThreads/Makefile OpenSceneGraph-2.9.7.na
cl/src/OpenThreads/Makefile |
168 --- OpenSceneGraph-2.9.7/src/OpenThreads/Makefile 1969-12-31 17:00:00.0000
00000 -0700 | 168 --- OpenSceneGraph-2.9.7/src/OpenThreads/Makefile 1969-12-31 17:00:00.0000
00000 -0700 |
169 +++ OpenSceneGraph-2.9.7.nacl/src/OpenThreads/Makefile 2010-07-01 17:32:53.0000
00000 -0600 | 169 +++ OpenSceneGraph-2.9.7.nacl/src/OpenThreads/Makefile 2010-07-01 17:32:53.0000
00000 -0600 |
170 @@ -0,0 +1,43 @@ | 170 @@ -0,0 +1,43 @@ |
171 +OSG_ROOT = ../.. | 171 +OSG_ROOT = ../.. |
172 + | 172 + |
173 +INCLUDE = -I$(OSG_ROOT)/include | 173 +INCLUDE = -I$(OSG_ROOT)/include |
174 + | 174 + |
175 +NACL_SDK_USR = ../../../../../toolchain/$(OS_PREFIX)_x86/nacl/usr | 175 +NACL_PORTS_PREFIX = ../../../../../toolchain/$(OS_PREFIX)_x86/nacl/usr |
176 + | 176 + |
177 +NACL_SDK_USR_INCLUDE = $(NACL_SDK_USR)/include | 177 +NACLPORTS_INCLUDE = $(NACL_PORTS_PREFIX)/include |
178 + | 178 + |
179 +NACL_SDK_USR_LIB = $(NACL_SDK_USR)/lib | 179 +NACLPORTS_LIBDIR = $(NACL_PORTS_PREFIX)/lib |
180 + | 180 + |
181 +INCLUDE = -I$(OSG_ROOT)/include | 181 +INCLUDE = -I$(OSG_ROOT)/include |
182 + | 182 + |
183 +COMMON_OBJ_FILES = \ | 183 +COMMON_OBJ_FILES = \ |
184 + common/Atomic.o \ | 184 + common/Atomic.o \ |
185 + common/Version.o | 185 + common/Version.o |
186 + | 186 + |
187 +PTHREADS_OBJ_FILES = \ | 187 +PTHREADS_OBJ_FILES = \ |
188 + pthreads/PThread.o \ | 188 + pthreads/PThread.o \ |
189 + pthreads/PThreadBarrier.o \ | 189 + pthreads/PThreadBarrier.o \ |
(...skipping 853 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1043 + | 1043 + |
1044 +} | 1044 +} |
1045 + | 1045 + |
1046 +#endif | 1046 +#endif |
1047 diff -Naur OpenSceneGraph-2.9.7/src/osg/Makefile OpenSceneGraph-2.9.7.nacl/src/o
sg/Makefile | 1047 diff -Naur OpenSceneGraph-2.9.7/src/osg/Makefile OpenSceneGraph-2.9.7.nacl/src/o
sg/Makefile |
1048 --- OpenSceneGraph-2.9.7/src/osg/Makefile 1969-12-31 17:00:00.000000000 -0
700 | 1048 --- OpenSceneGraph-2.9.7/src/osg/Makefile 1969-12-31 17:00:00.000000000 -0
700 |
1049 +++ OpenSceneGraph-2.9.7.nacl/src/osg/Makefile 2010-07-01 17:32:53.000000000 -0
600 | 1049 +++ OpenSceneGraph-2.9.7.nacl/src/osg/Makefile 2010-07-01 17:32:53.000000000 -0
600 |
1050 @@ -0,0 +1,161 @@ | 1050 @@ -0,0 +1,161 @@ |
1051 +OSG_ROOT = ../.. | 1051 +OSG_ROOT = ../.. |
1052 + | 1052 + |
1053 +NACL_SDK_USR = ../../../../../toolchain/$(OS_PREFIX)_x86/nacl/usr | 1053 +NACL_PORTS_PREFIX = ../../../../../toolchain/$(OS_PREFIX)_x86/nacl/usr |
1054 + | 1054 + |
1055 +NACL_SDK_USR_INCLUDE = $(NACL_SDK_USR)/include | 1055 +NACLPORTS_INCLUDE = $(NACL_PORTS_PREFIX)/include |
1056 + | 1056 + |
1057 +NACL_SDK_USR_LIB = $(NACL_SDK_USR)/lib | 1057 +NACLPORTS_LIBDIR = $(NACL_PORTS_PREFIX)/lib |
1058 + | 1058 + |
1059 +INCLUDE = -I$(OSG_ROOT)/include | 1059 +INCLUDE = -I$(OSG_ROOT)/include |
1060 + | 1060 + |
1061 +OBJ_FILES = \ | 1061 +OBJ_FILES = \ |
1062 + AlphaFunc.o \ | 1062 + AlphaFunc.o \ |
1063 + AnimationPath.o \ | 1063 + AnimationPath.o \ |
1064 + ApplicationUsage.o \ | 1064 + ApplicationUsage.o \ |
1065 + ArgumentParser.o \ | 1065 + ArgumentParser.o \ |
1066 + Array.o \ | 1066 + Array.o \ |
1067 + ArrayDispatchers.o \ | 1067 + ArrayDispatchers.o \ |
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1231 +#endif | 1231 +#endif |
1232 #include <windows.h> | 1232 #include <windows.h> |
1233 | 1233 |
1234 void osg::WinDebugNotifyHandler::notify(osg::NotifySeverity severity, const cha
r *message) | 1234 void osg::WinDebugNotifyHandler::notify(osg::NotifySeverity severity, const cha
r *message) |
1235 diff -Naur OpenSceneGraph-2.9.7/src/osgUtil/Makefile OpenSceneGraph-2.9.7.nacl/s
rc/osgUtil/Makefile | 1235 diff -Naur OpenSceneGraph-2.9.7/src/osgUtil/Makefile OpenSceneGraph-2.9.7.nacl/s
rc/osgUtil/Makefile |
1236 --- OpenSceneGraph-2.9.7/src/osgUtil/Makefile 1969-12-31 17:00:00.000000000 -0
700 | 1236 --- OpenSceneGraph-2.9.7/src/osgUtil/Makefile 1969-12-31 17:00:00.000000000 -0
700 |
1237 +++ OpenSceneGraph-2.9.7.nacl/src/osgUtil/Makefile 2010-07-01 17:32:53.0000
00000 -0600 | 1237 +++ OpenSceneGraph-2.9.7.nacl/src/osgUtil/Makefile 2010-07-01 17:32:53.0000
00000 -0600 |
1238 @@ -0,0 +1,66 @@ | 1238 @@ -0,0 +1,66 @@ |
1239 +OSG_ROOT = ../.. | 1239 +OSG_ROOT = ../.. |
1240 + | 1240 + |
1241 +NACL_SDK_USR = ../../../../../toolchain/$(OS_PREFIX)_x86/nacl/usr | 1241 +NACL_PORTS_PREFIX = ../../../../../toolchain/$(OS_PREFIX)_x86/nacl/usr |
1242 + | 1242 + |
1243 +NACL_SDK_USR_INCLUDE = $(NACL_SDK_USR)/include | 1243 +NACLPORTS_INCLUDE = $(NACL_PORTS_PREFIX)/include |
1244 + | 1244 + |
1245 +NACL_SDK_USR_LIB = $(NACL_SDK_USR)/lib | 1245 +NACLPORTS_LIBDIR = $(NACL_PORTS_PREFIX)/lib |
1246 + | 1246 + |
1247 +INCLUDE = -I$(OSG_ROOT)/include | 1247 +INCLUDE = -I$(OSG_ROOT)/include |
1248 + | 1248 + |
1249 +INCLUDE = -I$(OSG_ROOT)/include | 1249 +INCLUDE = -I$(OSG_ROOT)/include |
1250 + | 1250 + |
1251 +OBJ_FILES = \ | 1251 +OBJ_FILES = \ |
1252 + CubeMapGenerator.o \ | 1252 + CubeMapGenerator.o \ |
1253 + CullVisitor.o \ | 1253 + CullVisitor.o \ |
1254 + DelaunayTriangulator.o \ | 1254 + DelaunayTriangulator.o \ |
1255 + DisplayRequirementsVisitor.o \ | 1255 + DisplayRequirementsVisitor.o \ |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1295 + rm -rf $(OBJ_DIR) $(LIB_OSGUTIL) | 1295 + rm -rf $(OBJ_DIR) $(LIB_OSGUTIL) |
1296 + | 1296 + |
1297 +$(OBJ_DIR): | 1297 +$(OBJ_DIR): |
1298 + mkdir $(OBJ_DIR) | 1298 + mkdir $(OBJ_DIR) |
1299 + | 1299 + |
1300 +$(OBJ_FILES): %.o: %.cpp $(OBJ_DIR) | 1300 +$(OBJ_FILES): %.o: %.cpp $(OBJ_DIR) |
1301 + $(CXX) -c $(INCLUDE) $(CXXFLAGS) $< -o $(OBJ_DIR)/$@ | 1301 + $(CXX) -c $(INCLUDE) $(CXXFLAGS) $< -o $(OBJ_DIR)/$@ |
1302 + | 1302 + |
1303 +$(LIB_OSGUTIL): $(OBJ_DIR) $(OBJ_FILES) | 1303 +$(LIB_OSGUTIL): $(OBJ_DIR) $(OBJ_FILES) |
1304 + cd $(OBJ_DIR) && $(AR) rcs ../$(OSG_ROOT)/$(LIB_OSGUTIL) $(OBJ_FILES) | 1304 + cd $(OBJ_DIR) && $(AR) rcs ../$(OSG_ROOT)/$(LIB_OSGUTIL) $(OBJ_FILES) |
OLD | NEW |