Updated Makefile and project configurations for linux port.

This commit is contained in:
James 2013-01-22 16:45:35 +08:00
parent 680fbe3517
commit 1d7650767b
10 changed files with 3 additions and 35 deletions

View File

@ -309,7 +309,6 @@
<listOptionValue builtIn="false" value="../../../cocos2dx/platform/third_party/linux/libxml2"/>
<listOptionValue builtIn="false" value="../../../cocos2dx/platform/third_party/linux/libjpeg"/>
<listOptionValue builtIn="false" value="../../../cocos2dx/platform/third_party/linux/libtiff/include"/>
<listOptionValue builtIn="false" value="../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/include"/>
</option>
<option id="gnu.cpp.compiler.option.preprocessor.def.500904227" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" valueType="definedSymbols">
<listOptionValue builtIn="false" value="LINUX"/>
@ -349,7 +348,6 @@
<option id="gnu.cpp.link.option.libs.1702730055" name="Libraries (-l)" superClass="gnu.cpp.link.option.libs" valueType="libs">
<listOptionValue builtIn="false" value="glfw"/>
<listOptionValue builtIn="false" value="fontconfig"/>
<listOptionValue builtIn="false" value="GL"/>
<listOptionValue builtIn="false" value="GLEW"/>
</option>
<option id="gnu.cpp.link.option.soname.1183316897" name="Shared object name (-Wl,-soname=)" superClass="gnu.cpp.link.option.soname" value="" valueType="string"/>
@ -361,9 +359,7 @@
<listOptionValue builtIn="false" value="../../../cocos2dx/platform/third_party/linux/libraries/lib64/libpng.a"/>
<listOptionValue builtIn="false" value="../../../cocos2dx/platform/third_party/linux/libraries/lib64/libjpeg.a"/>
</option>
<option id="gnu.cpp.link.option.paths.2216001" name="Library search path (-L)" superClass="gnu.cpp.link.option.paths" valueType="libPaths">
<listOptionValue builtIn="false" value="../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/lib"/>
</option>
<option id="gnu.cpp.link.option.paths.2216001" name="Library search path (-L)" superClass="gnu.cpp.link.option.paths" valueType="libPaths"/>
<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.1435212610" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
<additionalInput kind="additionalinput" paths="$(LIBS)"/>
@ -444,7 +440,6 @@
<listOptionValue builtIn="false" value="../../../cocos2dx/platform/third_party/linux/libxml2"/>
<listOptionValue builtIn="false" value="../../../cocos2dx/platform/third_party/linux/libjpeg"/>
<listOptionValue builtIn="false" value="../../../cocos2dx/platform/third_party/linux/libtiff/include"/>
<listOptionValue builtIn="false" value="../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/include"/>
</option>
<option id="gnu.cpp.compiler.option.preprocessor.def.120885829" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" valueType="definedSymbols">
<listOptionValue builtIn="false" value="LINUX"/>
@ -484,7 +479,6 @@
<option id="gnu.cpp.link.option.libs.514385176" name="Libraries (-l)" superClass="gnu.cpp.link.option.libs" valueType="libs">
<listOptionValue builtIn="false" value="glfw"/>
<listOptionValue builtIn="false" value="fontconfig"/>
<listOptionValue builtIn="false" value="GL"/>
<listOptionValue builtIn="false" value="GLEW"/>
</option>
<option id="gnu.cpp.link.option.soname.121494156" name="Shared object name (-Wl,-soname=)" superClass="gnu.cpp.link.option.soname" value="" valueType="string"/>
@ -496,9 +490,7 @@
<listOptionValue builtIn="false" value="../../../cocos2dx/platform/third_party/linux/libraries/lib64/libpng.a"/>
<listOptionValue builtIn="false" value="../../../cocos2dx/platform/third_party/linux/libraries/lib64/libjpeg.a"/>
</option>
<option id="gnu.cpp.link.option.paths.2133869956" name="Library search path (-L)" superClass="gnu.cpp.link.option.paths" valueType="libPaths">
<listOptionValue builtIn="false" value="../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/lib"/>
</option>
<option id="gnu.cpp.link.option.paths.2133869956" name="Library search path (-L)" superClass="gnu.cpp.link.option.paths" valueType="libPaths"/>
<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.350375429" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
<additionalInput kind="additionalinput" paths="$(LIBS)"/>

View File

@ -20,7 +20,6 @@ INCLUDES = -I.. \
-I../../external/chipmunk/include/chipmunk \
-I../../extensions/network \
-I../platform/linux/ \
-I../platform/third_party/linux/glew-1.7.0/glew-1.7.0/include/ \
-I../platform/third_party/linux/libxml2 \
-I../platform/third_party/linux/libpng \
-I../platform/third_party/linux/libjpeg \

View File

@ -192,7 +192,6 @@
<listOptionValue builtIn="false" value="../../../../../cocos2dx/kazmath/include"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/platform/linux"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/platform/third_party/linux"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/include"/>
<listOptionValue builtIn="false" value="../../../../../CocosDenshion/include"/>
</option>
<option id="gnu.cpp.compiler.option.preprocessor.def.1548854529" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" valueType="definedSymbols">
@ -220,7 +219,6 @@
</option>
<option id="gnu.cpp.link.option.paths.1945345543" 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="../../../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/lib"/>
<listOptionValue builtIn="false" value="../../../../../CocosDenshion/proj.linux/${ConfigName}"/>
<listOptionValue builtIn="false" value="../../../../../CocosDenshion/third_party/fmod/lib64/api/lib"/>
</option>
@ -274,7 +272,6 @@
<listOptionValue builtIn="false" value="../../../../../cocos2dx/kazmath/include"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/platform/linux"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/platform/third_party/linux"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/include"/>
<listOptionValue builtIn="false" value="../../../../../CocosDenshion/include"/>
</option>
<option id="gnu.cpp.compiler.option.preprocessor.def.126458805" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" valueType="definedSymbols">

View File

@ -15,7 +15,6 @@ INCLUDES = -I../ \
-I$(COCOS2DX_PATH)/include \
-I$(COCOS2DX_PATH)/platform \
-I$(COCOS2DX_PATH)/platform/linux \
-I$(COCOS2DX_PATH)/platform/third_party/linux/glew-1.7.0/glew-1.7.0/include/ \
-I$(COCOS2DX_PATH)/kazmath/include \
-I$(COCOS2DX_PATH)/platform/third_party/linux/libxml2 \
-I$(COCOS2DX_PATH)/platform/third_party/linux/libjpeg \

View File

@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?fileVersion 4.0.0?>
<cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
<storageModule moduleId="org.eclipse.cdt.core.settings">
<cconfiguration id="cdt.managedbuild.config.gnu.exe.debug.699705174">
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.debug.699705174" moduleId="org.eclipse.cdt.core.settings" name="Debug">
@ -229,7 +227,6 @@
<listOptionValue builtIn="false" value="../../../../../cocos2dx/platform/third_party/linux/include64"/>
<listOptionValue builtIn="false" value="../../../../../CocosDenshion/include"/>
<listOptionValue builtIn="false" value="../../../../../external/chipmunk/include/chipmunk"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/include"/>
</option>
<option id="gnu.cpp.compiler.option.preprocessor.def.1397402419" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" valueType="definedSymbols">
<listOptionValue builtIn="false" value="LINUX"/>
@ -259,7 +256,6 @@
</option>
<option id="gnu.cpp.link.option.paths.150149413" 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="../../../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/lib"/>
<listOptionValue builtIn="false" value="../../../../../CocosDenshion/proj.linux/${ConfigName}"/>
<listOptionValue builtIn="false" value="../../../../../CocosDenshion/third_party/fmod/lib64/api/lib"/>
</option>
@ -321,7 +317,6 @@
<listOptionValue builtIn="false" value="../../../../../cocos2dx/platform/third_party/linux/include64"/>
<listOptionValue builtIn="false" value="../../../../../CocosDenshion/include"/>
<listOptionValue builtIn="false" value="../../../../../external/chipmunk/include/chipmunk"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/include"/>
</option>
<option id="gnu.cpp.compiler.option.preprocessor.def.2031321093" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" valueType="definedSymbols">
<listOptionValue builtIn="false" value="LINUX"/>
@ -351,7 +346,6 @@
</option>
<option id="gnu.cpp.link.option.paths.565843462" 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="../../../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/lib"/>
<listOptionValue builtIn="false" value="../../../../../CocosDenshion/proj.linux/${ConfigName}"/>
<listOptionValue builtIn="false" value="../../../../../CocosDenshion/third_party/fmod/lib64/api/lib"/>
</option>

View File

@ -17,7 +17,6 @@ INCLUDES = -I../ \
-I$(COCOS2DX_PATH)/kazmath/include \
-I$(COCOS2DX_PATH)/platform \
-I$(COCOS2DX_PATH)/platform/linux \
-I$(COCOS2DX_PATH)/platform/third_party/linux/glew-1.7.0/glew-1.7.0/include/ \
-I$(COCOS2DX_PATH)/platform/third_party/linux/libxml2 \
-I$(COCOS2DX_PATH)/platform/third_party/linux/libjpeg \
-I../../../../CocosDenshion/include \

View File

@ -219,7 +219,6 @@
<listOptionValue builtIn="false" value="../../../../../cocos2dx/kazmath/include"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/platform/linux"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/platform/third_party/linux"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/include"/>
<listOptionValue builtIn="false" value="../../../../../CocosDenshion/include"/>
<listOptionValue builtIn="false" value="../../../../../scripting/lua/cocos2dx_support"/>
<listOptionValue builtIn="false" value="../../../../../scripting/lua/lua"/>
@ -262,7 +261,6 @@
</option>
<option id="gnu.cpp.link.option.paths.516157740" name="Library search path (-L)" superClass="gnu.cpp.link.option.paths" valueType="libPaths">
<listOptionValue builtIn="false" value="&quot;../../../../../cocos2dx/proj.linux/${ConfigName}&quot;"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/lib"/>
<listOptionValue builtIn="false" value="&quot;../../../../../CocosDenshion/proj.linux/${ConfigName}&quot;"/>
<listOptionValue builtIn="false" value="&quot;../../../../../scripting/lua/proj.linux/${ConfigName}&quot;"/>
<listOptionValue builtIn="false" value="../../../../../CocosDenshion/third_party/fmod/lib64/api/lib"/>
@ -316,7 +314,6 @@
<listOptionValue builtIn="false" value="../../../../../cocos2dx/kazmath/include"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/platform/linux"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/platform/third_party/linux"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/include"/>
<listOptionValue builtIn="false" value="../../../../../CocosDenshion/include"/>
<listOptionValue builtIn="false" value="../../../../../scripting/lua/cocos2dx_support"/>
<listOptionValue builtIn="false" value="../../../../../scripting/lua/lua"/>
@ -359,7 +356,6 @@
</option>
<option id="gnu.cpp.link.option.paths.2111931120" name="Library search path (-L)" superClass="gnu.cpp.link.option.paths" valueType="libPaths">
<listOptionValue builtIn="false" value="&quot;../../../../../cocos2dx/proj.linux/${ConfigName}&quot;"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/lib"/>
<listOptionValue builtIn="false" value="&quot;../../../../../CocosDenshion/proj.linux/${ConfigName}&quot;"/>
<listOptionValue builtIn="false" value="&quot;../../../../../scripting/lua/proj.linux/${ConfigName}&quot;"/>
<listOptionValue builtIn="false" value="../../../../../CocosDenshion/third_party/fmod/lib64/api/lib"/>

View File

@ -15,7 +15,6 @@ INCLUDES = -I../ \
-I$(COCOS2DX_PATH)/include \
-I$(COCOS2DX_PATH)/platform \
-I$(COCOS2DX_PATH)/platform/linux \
-I$(COCOS2DX_PATH)/platform/third_party/linux/glew-1.7.0/glew-1.7.0/include/ \
-I$(COCOS2DX_PATH)/kazmath/include \
-I$(COCOS2DX_PATH)/platform/third_party/linux/libxml2 \
-I$(COCOS2DX_PATH)/platform/third_party/linux/libjpeg \

View File

@ -223,7 +223,6 @@
<listOptionValue builtIn="false" value="../../../../../cocos2dx/kazmath/include"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/platform/linux"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/platform/third_party/linux"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/include"/>
<listOptionValue builtIn="false" value="../../../../../CocosDenshion/include"/>
<listOptionValue builtIn="false" value="../../../../../scripting/lua/cocos2dx_support"/>
<listOptionValue builtIn="false" value="../../../../../scripting/lua/lua"/>
@ -242,7 +241,6 @@
<listOptionValue builtIn="false" value="../../../../../cocos2dx/kazmath/include"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/platform/linux"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/platform/third_party/linux"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/include"/>
<listOptionValue builtIn="false" value="../../../../../CocosDenshion/include"/>
<listOptionValue builtIn="false" value="../../../../../scripting/lua/cocos2dx_support"/>
<listOptionValue builtIn="false" value="../../../../../scripting/lua/lua"/>
@ -266,7 +264,6 @@
<listOptionValue builtIn="false" value="&quot;../../../../../CocosDenshion/proj.linux/${ConfigName}&quot;"/>
<listOptionValue builtIn="false" value="&quot;../../../../../scripting/lua/proj.linux/${ConfigName}&quot;"/>
<listOptionValue builtIn="false" value="../../../../../CocosDenshion/third_party/fmod/lib64/api/lib"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/lib"/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.1332538227" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
@ -317,7 +314,6 @@
<listOptionValue builtIn="false" value="../../../../../cocos2dx/kazmath/include"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/platform/linux"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/platform/third_party/linux"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/include"/>
<listOptionValue builtIn="false" value="../../../../../CocosDenshion/include"/>
<listOptionValue builtIn="false" value="../../../../../scripting/lua/cocos2dx_support"/>
<listOptionValue builtIn="false" value="../../../../../scripting/lua/lua"/>
@ -339,7 +335,6 @@
<listOptionValue builtIn="false" value="../../../../../cocos2dx/kazmath/include"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/platform/linux"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/platform/third_party/linux"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/include"/>
<listOptionValue builtIn="false" value="../../../../../CocosDenshion/include"/>
<listOptionValue builtIn="false" value="../../../../../scripting/lua/cocos2dx_support"/>
<listOptionValue builtIn="false" value="../../../../../scripting/lua/lua"/>
@ -363,7 +358,6 @@
<listOptionValue builtIn="false" value="&quot;../../../../../CocosDenshion/proj.linux/${ConfigName}&quot;"/>
<listOptionValue builtIn="false" value="&quot;../../../../../scripting/lua/proj.linux/${ConfigName}&quot;"/>
<listOptionValue builtIn="false" value="../../../../../CocosDenshion/third_party/fmod/lib64/api/lib"/>
<listOptionValue builtIn="false" value="../../../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/lib"/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.479170088" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>

View File

@ -15,7 +15,6 @@ INCLUDES = -I../ \
-I$(COCOS2DX_PATH)/include \
-I$(COCOS2DX_PATH)/platform \
-I$(COCOS2DX_PATH)/platform/linux \
-I$(COCOS2DX_PATH)/platform/third_party/linux/glew-1.7.0/glew-1.7.0/include/ \
-I$(COCOS2DX_PATH)/kazmath/include \
-I$(COCOS2DX_PATH)/platform/third_party/linux/libxml2 \
-I$(COCOS2DX_PATH)/platform/third_party/linux/libjpeg \