update linux project configure

georgeyang316 · Feb 15, 2012 · 956c6b1 · 956c6b1
1 parent b377861
commit 956c6b1
Show file tree

Hide file tree

Showing 10 changed files with 84 additions and 59 deletions.
diff --git a/CocosDenshion/proj.linux/.cproject b/CocosDenshion/proj.linux/.cproject
@@ -33,7 +33,7 @@
 								<option id="gnu.cpp.compiler.exe.debug.option.debugging.level.886209200" name="Debug Level" superClass="gnu.cpp.compiler.exe.debug.option.debugging.level" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/>
 								<option id="gnu.cpp.compiler.option.include.paths.1002280254" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">
 									<listOptionValue builtIn="false" value="../../include"/>
-									<listOptionValue builtIn="false" value="../../third_party/fmod/api/inc"/>
+									<listOptionValue builtIn="false" value="../../third_party/linux/fmod/api/inc"/>
 								</option>
 								<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1604049990" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
 							</tool>
@@ -42,7 +42,7 @@
 								<option id="gnu.c.compiler.exe.debug.option.debugging.level.828037565" name="Debug Level" superClass="gnu.c.compiler.exe.debug.option.debugging.level" value="gnu.c.debugging.level.max" valueType="enumerated"/>
 								<option id="gnu.c.compiler.option.include.paths.985313341" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
 									<listOptionValue builtIn="false" value="../../include"/>
-									<listOptionValue builtIn="false" value="../../third_party/fmod/api/inc"/>
+									<listOptionValue builtIn="false" value="../../third_party/linux/fmod/api/inc"/>
 								</option>
 								<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.370598124" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
 							</tool>
@@ -55,7 +55,7 @@
 								</option>
 								<option defaultValue="true" id="gnu.cpp.link.option.shared.430688089" name="Shared (-shared)" superClass="gnu.cpp.link.option.shared" valueType="boolean"/>
 								<option id="gnu.cpp.link.option.paths.1630974641" name="Library search path (-L)" superClass="gnu.cpp.link.option.paths" valueType="libPaths">
-									<listOptionValue builtIn="false" value="../../third_party/fmod/api/lib"/>
+									<listOptionValue builtIn="false" value="../../third_party/linux/fmod/api/lib"/>
 								</option>
 								<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.1207468004" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
@@ -68,9 +68,8 @@
 						</toolChain>
 					</folderInfo>
 					<sourceEntries>
-						<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="Linux"/>
-						<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="include"/>
-						<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="third_party"/>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="include"/>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="linux"/>
 					</sourceEntries>
 				</configuration>
 			</storageModule>
@@ -107,7 +106,7 @@
 								<option id="gnu.cpp.compiler.exe.release.option.debugging.level.2015755429" name="Debug Level" superClass="gnu.cpp.compiler.exe.release.option.debugging.level" value="gnu.cpp.compiler.debugging.level.none" valueType="enumerated"/>
 								<option id="gnu.cpp.compiler.option.include.paths.1414683978" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">
 									<listOptionValue builtIn="false" value="../../include"/>
-									<listOptionValue builtIn="false" value="../../third_party/fmod/api/inc"/>
+									<listOptionValue builtIn="false" value="../../third_party/linux/fmod/api/inc"/>
 								</option>
 								<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1557365568" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
 							</tool>
@@ -116,7 +115,7 @@
 								<option id="gnu.c.compiler.exe.release.option.debugging.level.1006696632" name="Debug Level" superClass="gnu.c.compiler.exe.release.option.debugging.level" value="gnu.c.debugging.level.none" valueType="enumerated"/>
 								<option id="gnu.c.compiler.option.include.paths.92938039" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
 									<listOptionValue builtIn="false" value="../../include"/>
-									<listOptionValue builtIn="false" value="../../third_party/fmod/api/inc"/>
+									<listOptionValue builtIn="false" value="../../third_party/linux/fmod/api/inc"/>
 								</option>
 								<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.757092405" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
 							</tool>
@@ -129,7 +128,7 @@
 								</option>
 								<option defaultValue="true" id="gnu.cpp.link.option.shared.1840009551" name="Shared (-shared)" superClass="gnu.cpp.link.option.shared" valueType="boolean"/>
 								<option id="gnu.cpp.link.option.paths.1502506408" name="Library search path (-L)" superClass="gnu.cpp.link.option.paths" valueType="libPaths">
-									<listOptionValue builtIn="false" value="../../third_party/fmod/api/lib"/>
+									<listOptionValue builtIn="false" value="../../third_party/linux/fmod/api/lib"/>
 								</option>
 								<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.1952243970" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
@@ -142,9 +141,8 @@
 						</toolChain>
 					</folderInfo>
 					<sourceEntries>
-						<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="Linux"/>
 						<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="include"/>
-						<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="third_party"/>
+						<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="linux"/>
 					</sourceEntries>
 				</configuration>
 			</storageModule>

diff --git a/CocosDenshion/proj.linux/.project b/CocosDenshion/proj.linux/.project
@@ -82,19 +82,14 @@
 	</natures>
 	<linkedResources>
 		<link>
-			<name>Linux</name>
+			<name>linux</name>
 			<type>2</type>
-			<locationURI>PARENT-1-PROJECT_LOC/Linux</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/linux</locationURI>
 		</link>
 		<link>
 			<name>include</name>
 			<type>2</type>
 			<locationURI>PARENT-1-PROJECT_LOC/include</locationURI>
 		</link>
-		<link>
-			<name>third_party</name>
-			<type>2</type>
-			<locationURI>PARENT-1-PROJECT_LOC/third_party</locationURI>
-		</link>
 	</linkedResources>
 </projectDescription>
diff --git a/CocosDenshion/proj.linux/Makefile b/CocosDenshion/proj.linux/Makefile
@@ -9,11 +9,11 @@ LBITS := $(shell getconf LONG_BIT)
 ifeq ($(LBITS),64)
 INCLUDES = -I.. \
 		-I../include \
-		-I../third_party/fmod/lib64/api/inc 
+		-I../third_party/linux/fmod/lib64/api/inc 
 else
 INCLUDES = -I.. \
 		-I../include \
-		-I../third_party/fmod/api/inc 
+		-I../third_party/linux/fmod/api/inc 
 endif
 
 
@@ -25,10 +25,10 @@ OBJECTS =   ../Linux/FmodAudioPlayer.o \
 STATICLIBS = 
 
 ifeq ($(LBITS),64)
-SHAREDLIBS_DIR = ../third_party/fmod/lib64/api/lib
+SHAREDLIBS_DIR = ../third_party/linux/fmod/lib64/api/lib
 SHAREDLIBS = -L$(SHAREDLIBS_DIR) -lfmodex64
 else
-SHAREDLIBS_DIR = ../third_party/fmod/api/lib
+SHAREDLIBS_DIR = ../third_party/linux/fmod/api/lib
 SHAREDLIBS = -L$(SHAREDLIBS_DIR) -lfmodex
 endif
 

diff --git a/CocosDenshion/proj.qnx/.cproject b/CocosDenshion/proj.qnx/.cproject
@@ -49,7 +49,7 @@
 									<listOptionValue builtIn="false" value="../../include"/>
 									<listOptionValue builtIn="false" value="../../third_party/qnx/include"/>
 								</option>
-								<option id="com.qnx.qcc.option.compiler.qccoptions.1372558930" name="QCC Options" superClass="com.qnx.qcc.option.compiler.qccoptions" valueType="stringList"/>
+								<option id="com.qnx.qcc.option.compiler.qccoptions.1372558930" name="QCC Options" superClass="com.qnx.qcc.option.compiler.qccoptions"/>
 								<inputType id="com.qnx.qcc.inputType.compiler.1849571146" superClass="com.qnx.qcc.inputType.compiler"/>
 							</tool>
 							<tool id="com.qnx.qcc.tool.assembler.699645133" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler">
@@ -77,7 +77,7 @@
 								<option id="com.qnx.qcc.option.linker.libraries.1877286895" name="Libraries (-l)" superClass="com.qnx.qcc.option.linker.libraries" valueType="libs">
 									<listOptionValue builtIn="false" value="vorbis"/>
 								</option>
-								<option id="com.qnx.qcc.option.linker.qccoptions.912514424" name="QCC Options" superClass="com.qnx.qcc.option.linker.qccoptions" valueType="stringList"/>
+								<option id="com.qnx.qcc.option.linker.qccoptions.912514424" name="QCC Options" superClass="com.qnx.qcc.option.linker.qccoptions"/>
 								<inputType id="com.qnx.qcc.inputType.linker.1016187136" superClass="com.qnx.qcc.inputType.linker">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>

diff --git a/HelloWorld/linux/.cproject b/HelloWorld/linux/.cproject
@@ -43,7 +43,7 @@
 							<tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.debug.1024548975" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.debug">
 								<option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.exe.debug.option.optimization.level.1846873676" name="Optimization Level" superClass="gnu.c.compiler.exe.debug.option.optimization.level" valueType="enumerated"/>
 								<option id="gnu.c.compiler.exe.debug.option.debugging.level.624794682" name="Debug Level" superClass="gnu.c.compiler.exe.debug.option.debugging.level" value="gnu.c.debugging.level.max" valueType="enumerated"/>
-								<option id="gnu.c.compiler.option.include.paths.141168982" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath"/>
+								<option id="gnu.c.compiler.option.include.paths.141168982" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths"/>
 								<option id="gnu.c.compiler.option.preprocessor.def.symbols.1586206751" name="Defined symbols (-D)" superClass="gnu.c.compiler.option.preprocessor.def.symbols" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="LINUX"/>
 								</option>
@@ -60,7 +60,7 @@
 								<option id="gnu.cpp.link.option.paths.1730426040" name="Library search path (-L)" superClass="gnu.cpp.link.option.paths" valueType="libPaths">
 									<listOptionValue builtIn="false" value="../../../cocos2dx/proj.linux/${ConfigName}"/>
 									<listOptionValue builtIn="false" value="../../../CocosDenshion/proj.linux/${ConfigName}"/>
-									<listOptionValue builtIn="false" value="../../../CocosDenshion/third_party/fmod/api/lib"/>
+									<listOptionValue builtIn="false" value="../../../CocosDenshion/third_party/linux/fmod/api/lib"/>
 								</option>
 								<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.338357910" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
@@ -121,7 +121,7 @@
 							<tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.release.1992070152" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.release">
 								<option defaultValue="gnu.c.optimization.level.most" id="gnu.c.compiler.exe.release.option.optimization.level.925598500" name="Optimization Level" superClass="gnu.c.compiler.exe.release.option.optimization.level" valueType="enumerated"/>
 								<option id="gnu.c.compiler.exe.release.option.debugging.level.1434439101" name="Debug Level" superClass="gnu.c.compiler.exe.release.option.debugging.level" value="gnu.c.debugging.level.none" valueType="enumerated"/>
-								<option id="gnu.c.compiler.option.include.paths.92708570" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath"/>
+								<option id="gnu.c.compiler.option.include.paths.92708570" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths"/>
 								<option id="gnu.c.compiler.option.preprocessor.def.symbols.1314682529" name="Defined symbols (-D)" superClass="gnu.c.compiler.option.preprocessor.def.symbols" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="LINUX"/>
 								</option>
@@ -138,7 +138,7 @@
 								<option id="gnu.cpp.link.option.paths.510724007" name="Library search path (-L)" superClass="gnu.cpp.link.option.paths" valueType="libPaths">
 									<listOptionValue builtIn="false" value="../../../cocos2dx/proj.linux/${ConfigName}"/>
 									<listOptionValue builtIn="false" value="../../../CocosDenshion/proj.linux/${ConfigName}"/>
-									<listOptionValue builtIn="false" value="../../../CocosDenshion/third_party/fmod/api/lib"/>
+									<listOptionValue builtIn="false" value="../../../CocosDenshion/third_party/linux/fmod/api/lib"/>
 								</option>
 								<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.970027608" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>

diff --git a/build-linux.sh b/build-linux.sh
@@ -24,7 +24,7 @@ mkdir "lib/linux/Release"
 fi
 
 # copy cocosdenshino depended libs into lib/linux/Debug/
-cp CocosDenshion/third_party/fmod/api/lib/*.so lib/linux/Debug
+cp CocosDenshion/third_party/linux/fmod/api/lib/*.so lib/linux/Debug
 
 if [ $# -ne 0 ]; then
 	if [ $1 = "clean" ]; then