diff --git a/Box2D/proj.bada/sdk2.0/.badaprj b/Box2D/proj.bada/sdk2.0/.badaprj
index c3fb00dba1..3435da725a 100644
--- a/Box2D/proj.bada/sdk2.0/.badaprj
+++ b/Box2D/proj.bada/sdk2.0/.badaprj
@@ -1,19 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <bada>
-    <type>2</type>
+    <type>0</type>
     <sdk>C:\bada\2.0.2</sdk>
-    <model>WaveWVGA</model>
+    <model>WaveHVGA</model>
     <apiversioncheck>true</apiversioncheck>
     <priviligecheck>false</priviligecheck>
-    <properties>
-        <data0 key="PT CmdArgs Target-Release" value=""/>
-        <data1 key="PT CertFile Simulator-Debug" value="${project_loc}\.Simulator-Debug\cert.cer"/>
-        <data2 key="PT CertFile Target-Release" value="${project_loc}\.Target-Release\cert.cer"/>
-        <data3 key="PT Output Simulator-Debug" value="${project_loc}\.Simulator-Debug"/>
-        <data4 key="PT CertFile Target-Debug" value="${project_loc}\.Target-Debug\cert.cer"/>
-        <data5 key="PT CmdArgs Target-Debug" value=""/>
-        <data6 key="PT Output Target-Release" value="${project_loc}\.Target-Release"/>
-        <data7 key="PT CmdArgs Simulator-Debug" value=""/>
-        <data8 key="PT Output Target-Debug" value="${project_loc}\.Target-Debug"/>
-    </properties>
+    <properties/>
 </bada>
diff --git a/CocosDenshion/proj.bada/sdk1.0/.badaprj b/CocosDenshion/proj.bada/sdk1.0/.badaprj
index 4fb41c8373..15683a6db8 100644
--- a/CocosDenshion/proj.bada/sdk1.0/.badaprj
+++ b/CocosDenshion/proj.bada/sdk1.0/.badaprj
@@ -3,15 +3,5 @@
     <type>3</type>
     <sdk>C:\bada\1.0.0</sdk>
     <model>Wave_LP2</model>
-    <properties>
-        <data0 key="PT CmdArgs Target-Release" value=""/>
-        <data1 key="PT CertFile Simulator-Debug" value="${project_loc}\.Simulator-Debug\cert.cer"/>
-        <data2 key="PT CertFile Target-Release" value="${project_loc}\.Target-Release\cert.cer"/>
-        <data3 key="PT Output Simulator-Debug" value="${project_loc}\.Simulator-Debug"/>
-        <data4 key="PT CertFile Target-Debug" value="${project_loc}\.Target-Debug\cert.cer"/>
-        <data5 key="PT CmdArgs Target-Debug" value=""/>
-        <data6 key="PT Output Target-Release" value="${project_loc}\.Target-Release"/>
-        <data7 key="PT CmdArgs Simulator-Debug" value=""/>
-        <data8 key="PT Output Target-Debug" value="${project_loc}\.Target-Debug"/>
     </properties>
 </bada>
diff --git a/CocosDenshion/proj.bada/sdk2.0/.badaprj b/CocosDenshion/proj.bada/sdk2.0/.badaprj
index 3435da725a..39a4c4a302 100644
--- a/CocosDenshion/proj.bada/sdk2.0/.badaprj
+++ b/CocosDenshion/proj.bada/sdk2.0/.badaprj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <bada>
-    <type>0</type>
+    <type>3</type>
     <sdk>C:\bada\2.0.2</sdk>
     <model>WaveHVGA</model>
     <apiversioncheck>true</apiversioncheck>
diff --git a/CocosDenshion/proj.bada/sdk2.0/.cproject b/CocosDenshion/proj.bada/sdk2.0/.cproject
index 26a0569008..08f2d7f50f 100644
--- a/CocosDenshion/proj.bada/sdk2.0/.cproject
+++ b/CocosDenshion/proj.bada/sdk2.0/.cproject
@@ -3,8 +3,8 @@
 
 <cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
 	<storageModule moduleId="org.eclipse.cdt.core.settings">
-		<cconfiguration id="cdt.managedbuild.config.osp.gnu.target.lib.debug.1627292273">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.osp.gnu.target.lib.debug.1627292273" moduleId="org.eclipse.cdt.core.settings" name="Target-Debug">
+		<cconfiguration id="cdt.managedbuild.config.osp.gnu.target.so.debug.1191634796">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.osp.gnu.target.so.debug.1191634796" moduleId="org.eclipse.cdt.core.settings" name="Target-Debug">
 				<externalSettings>
 					<externalSetting>
 						<entry flags="VALUE_WORKSPACE_PATH" kind="includePath" name="/CocosDenshion"/>
@@ -24,37 +24,46 @@
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="a" artifactName="CocosDenshion" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.staticLib" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.staticLib" cleanCommand="rm -rf" description="" errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser" id="cdt.managedbuild.config.osp.gnu.target.lib.debug.1627292273" name="Target-Debug" parent="cdt.managedbuild.config.osp.gnu.target.lib.debug">
-					<folderInfo id="cdt.managedbuild.config.osp.gnu.target.lib.debug.1627292273." name="/" resourcePath="">
-						<toolChain id="cdt.managedbuild.toolchain.osp.gnu.target.lib.debug.734374180" name="bada GCC ToolChain" superClass="cdt.managedbuild.toolchain.osp.gnu.target.lib.debug">
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.Cygwin_PE;org.eclipse.cdt.core.GNU_ELF;org.eclipse.cdt.core.ELF" id="cdt.managedbuild.target.osp.gnu.target.platform.lib.debug.1445345711" name="Debug Platform" osList="osp" superClass="cdt.managedbuild.target.osp.gnu.target.platform.lib.debug"/>
-							<builder buildPath="${workspace_loc:/CocosDenshion/.Target-Debug}" command="cs-make" id="cdt.managedbuild.target.osp.gnu.target.builder.lib.debug.2056098569" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="bada Builder" superClass="cdt.managedbuild.target.osp.gnu.target.builder.lib.debug"/>
-							<tool id="cdt.managedbuild.tool.osp.gnu.arm.archiver.lib.debug.1038178366" name="bada Archiver" superClass="cdt.managedbuild.tool.osp.gnu.arm.archiver.lib.debug"/>
-							<tool id="cdt.managedbuild.tool.osp.gnu.target.cpp.compiler.lib.debug.890640682" name="bada C++ Compiler" superClass="cdt.managedbuild.tool.osp.gnu.target.cpp.compiler.lib.debug">
-								<option id="osp.gnu.target.cpp.compiler.debug.lib.option.include.paths.681425717" name="Include paths (-I)" superClass="osp.gnu.target.cpp.compiler.debug.lib.option.include.paths" valueType="includePath">
+				<configuration artifactExtension="so" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.sharedLib" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.sharedLib" cleanCommand="rm -rf" description="" errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser" id="cdt.managedbuild.config.osp.gnu.target.so.debug.1191634796" name="Target-Debug" parent="cdt.managedbuild.config.osp.gnu.target.so.debug">
+					<folderInfo id="cdt.managedbuild.config.osp.gnu.target.so.debug.1191634796." name="/" resourcePath="">
+						<toolChain id="cdt.managedbuild.toolchain.osp.gnu.target.so.debug.329667272" name="bada GCC ToolChain" superClass="cdt.managedbuild.toolchain.osp.gnu.target.so.debug">
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.Cygwin_PE;org.eclipse.cdt.core.GNU_ELF;org.eclipse.cdt.core.ELF" id="cdt.managedbuild.target.osp.gnu.target.platform.so.debug.1155249821" name="Debug Platform" osList="osp" superClass="cdt.managedbuild.target.osp.gnu.target.platform.so.debug"/>
+							<builder buildPath="${workspace_loc:/CocosDenshion/.Target-Debug}" command="cs-make" id="cdt.managedbuild.target.osp.gnu.target.builder.so.debug.2090001571" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="bada Builder" superClass="cdt.managedbuild.target.osp.gnu.target.builder.so.debug"/>
+							<tool id="cdt.managedbuild.tool.osp.gnu.arm.archiver.base.1685402292" name="bada Archiver" superClass="cdt.managedbuild.tool.osp.gnu.arm.archiver.base"/>
+							<tool id="cdt.managedbuild.tool.osp.gnu.target.cpp.compiler.so.debug.1064963857" name="bada C++ Compiler" superClass="cdt.managedbuild.tool.osp.gnu.target.cpp.compiler.so.debug">
+								<option id="osp.gnu.target.cpp.compiler.debug.so.option.preprocessor.def.630710739" name="Defined symbols (-D)" superClass="osp.gnu.target.cpp.compiler.debug.so.option.preprocessor.def" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="SHP"/>
+									<listOptionValue builtIn="false" value="_DEBUG"/>
+									<listOptionValue builtIn="false" value="CC_BADA_2_0"/>
+								</option>
+								<option id="osp.gnu.target.cpp.compiler.debug.so.option.include.paths.716302668" superClass="osp.gnu.target.cpp.compiler.debug.so.option.include.paths" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${SDKROOT}/include&quot;"/>
 									<listOptionValue builtIn="false" value="../../../include"/>
 								</option>
-								<inputType id="cdt.managedbuild.tool.osp.gnu.cpp.compiler.input.1151794390" superClass="cdt.managedbuild.tool.osp.gnu.cpp.compiler.input"/>
+								<inputType id="cdt.managedbuild.tool.osp.gnu.cpp.compiler.input.1952294255" superClass="cdt.managedbuild.tool.osp.gnu.cpp.compiler.input"/>
 							</tool>
-							<tool id="cdt.managedbuild.tool.osp.gnu.target.c.compiler.lib.debug.1600003830" name="bada C Compiler" superClass="cdt.managedbuild.tool.osp.gnu.target.c.compiler.lib.debug">
-								<inputType id="cdt.managedbuild.tool.osp.gnu.c.compiler.input.2067434681" superClass="cdt.managedbuild.tool.osp.gnu.c.compiler.input"/>
+							<tool id="cdt.managedbuild.tool.osp.gnu.target.c.compiler.so.debug.25148670" name="bada C Compiler" superClass="cdt.managedbuild.tool.osp.gnu.target.c.compiler.so.debug">
+								<inputType id="cdt.managedbuild.tool.osp.gnu.c.compiler.input.1332966355" superClass="cdt.managedbuild.tool.osp.gnu.c.compiler.input"/>
 							</tool>
-							<tool id="cdt.managedbuild.tool.osp.gnu.arm.c.linker.base.561618835" name="bada C Linker" superClass="cdt.managedbuild.tool.osp.gnu.arm.c.linker.base"/>
-							<tool id="cdt.managedbuild.tool.osp.gnu.arm.cpp.linker.base.1273040823" name="bada C++ Linker" superClass="cdt.managedbuild.tool.osp.gnu.arm.cpp.linker.base"/>
-							<tool id="cdt.managedbuild.tool.osp.gnu.target.assembler.lib.debug.524917508" name="bada Assembler" superClass="cdt.managedbuild.tool.osp.gnu.target.assembler.lib.debug">
-								<inputType id="cdt.managedbuild.tool.osp.gnu.assembler.input.1107390017" superClass="cdt.managedbuild.tool.osp.gnu.assembler.input"/>
+							<tool id="cdt.managedbuild.tool.osp.gnu.target.c.linker.so.debug.1930124323" name="bada C Linker" superClass="cdt.managedbuild.tool.osp.gnu.target.c.linker.so.debug"/>
+							<tool id="cdt.managedbuild.tool.osp.gnu.target.cpp.linker.so.debug.1196904841" name="bada C++ Linker" superClass="cdt.managedbuild.tool.osp.gnu.target.cpp.linker.so.debug">
+								<inputType id="cdt.managedbuild.tool.osp.gnu.cpp.linker.input.1773800931" superClass="cdt.managedbuild.tool.osp.gnu.cpp.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="cdt.managedbuild.tool.osp.gnu.target.assembler.so.debug.825378510" name="bada Assembler" superClass="cdt.managedbuild.tool.osp.gnu.target.assembler.so.debug">
+								<inputType id="cdt.managedbuild.tool.osp.gnu.assembler.input.1912873224" superClass="cdt.managedbuild.tool.osp.gnu.assembler.input"/>
 							</tool>
 						</toolChain>
 					</folderInfo>
 					<sourceEntries>
-						<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="bada"/>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="bada"/>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="include"/>
 					</sourceEntries>
 				</configuration>
 			</storageModule>
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-			<storageModule moduleId="org.eclipse.cdt.core.language.mapping"/>
-			<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
 			<storageModule moduleId="scannerConfiguration">
 				<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
 				<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
@@ -73,7 +82,7 @@
 						<parser enabled="true"/>
 					</buildOutputProvider>
 					<scannerInfoProvider id="makefileGenerator">
-						<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+						<runAction arguments="-E -P -v -dD" command="" useDefault="true"/>
 						<parser enabled="true"/>
 					</scannerInfoProvider>
 				</profile>
@@ -137,7 +146,7 @@
 						<parser enabled="true"/>
 					</scannerInfoProvider>
 				</profile>
-				<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.osp.gnu.arm.lib.simul.1611426355;cdt.managedbuild.config.osp.gnu.arm.lib.simul.1611426355.;cdt.managedbuild.tool.osp.gnu.simul.c.compiler.lib.simul.1643639387;cdt.managedbuild.tool.osp.gnu.c.compiler.input.991154682">
+				<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.osp.gnu.target.so.debug.1191634796;cdt.managedbuild.config.osp.gnu.target.so.debug.1191634796.;cdt.managedbuild.tool.osp.gnu.target.c.compiler.so.debug.25148670;cdt.managedbuild.tool.osp.gnu.c.compiler.input.1332966355">
 					<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
 					<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
 						<buildOutputProvider>
@@ -155,7 +164,7 @@
 							<parser enabled="true"/>
 						</buildOutputProvider>
 						<scannerInfoProvider id="makefileGenerator">
-							<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+							<runAction arguments="-E -P -v -dD" command="" useDefault="true"/>
 							<parser enabled="true"/>
 						</scannerInfoProvider>
 					</profile>
@@ -220,7 +229,90 @@
 						</scannerInfoProvider>
 					</profile>
 				</scannerConfigBuildInfo>
-				<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.osp.gnu.target.lib.debug.1627292273;cdt.managedbuild.config.osp.gnu.target.lib.debug.1627292273.;cdt.managedbuild.tool.osp.gnu.target.c.compiler.lib.debug.1600003830;cdt.managedbuild.tool.osp.gnu.c.compiler.input.2067434681">
+				<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.osp.gnu.target.so.release.284388679;cdt.managedbuild.config.osp.gnu.target.so.release.284388679.;cdt.managedbuild.tool.osp.gnu.target.cpp.compiler.so.release.2122538510;cdt.managedbuild.tool.osp.gnu.cpp.compiler.input.437912108">
+					<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"/>
+					<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+						<buildOutputProvider>
+							<openAction enabled="true" filePath=""/>
+							<parser enabled="true"/>
+						</buildOutputProvider>
+						<scannerInfoProvider id="specsFile">
+							<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+							<parser enabled="true"/>
+						</scannerInfoProvider>
+					</profile>
+					<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+						<buildOutputProvider>
+							<openAction enabled="true" filePath=""/>
+							<parser enabled="true"/>
+						</buildOutputProvider>
+						<scannerInfoProvider id="makefileGenerator">
+							<runAction arguments="-E -P -v -dD" command="" useDefault="true"/>
+							<parser enabled="true"/>
+						</scannerInfoProvider>
+					</profile>
+					<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+						<buildOutputProvider>
+							<openAction enabled="true" filePath=""/>
+							<parser enabled="true"/>
+						</buildOutputProvider>
+						<scannerInfoProvider id="specsFile">
+							<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+							<parser enabled="true"/>
+						</scannerInfoProvider>
+					</profile>
+					<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+						<buildOutputProvider>
+							<openAction enabled="true" filePath=""/>
+							<parser enabled="true"/>
+						</buildOutputProvider>
+						<scannerInfoProvider id="specsFile">
+							<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+							<parser enabled="true"/>
+						</scannerInfoProvider>
+					</profile>
+					<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+						<buildOutputProvider>
+							<openAction enabled="true" filePath=""/>
+							<parser enabled="true"/>
+						</buildOutputProvider>
+						<scannerInfoProvider id="specsFile">
+							<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+							<parser enabled="true"/>
+						</scannerInfoProvider>
+					</profile>
+					<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+						<buildOutputProvider>
+							<openAction enabled="true" filePath=""/>
+							<parser enabled="true"/>
+						</buildOutputProvider>
+						<scannerInfoProvider id="specsFile">
+							<runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/${specs_file}&quot;'" command="sh" useDefault="true"/>
+							<parser enabled="true"/>
+						</scannerInfoProvider>
+					</profile>
+					<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+						<buildOutputProvider>
+							<openAction enabled="true" filePath=""/>
+							<parser enabled="true"/>
+						</buildOutputProvider>
+						<scannerInfoProvider id="specsFile">
+							<runAction arguments="-c 'g++ -E -P -v -dD &quot;${plugin_state_location}/specs.cpp&quot;'" command="sh" useDefault="true"/>
+							<parser enabled="true"/>
+						</scannerInfoProvider>
+					</profile>
+					<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+						<buildOutputProvider>
+							<openAction enabled="true" filePath=""/>
+							<parser enabled="true"/>
+						</buildOutputProvider>
+						<scannerInfoProvider id="specsFile">
+							<runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/specs.c&quot;'" command="sh" useDefault="true"/>
+							<parser enabled="true"/>
+						</scannerInfoProvider>
+					</profile>
+				</scannerConfigBuildInfo>
+				<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.osp.gnu.target.so.release.284388679;cdt.managedbuild.config.osp.gnu.target.so.release.284388679.;cdt.managedbuild.tool.osp.gnu.target.c.compiler.so.release.12061378;cdt.managedbuild.tool.osp.gnu.c.compiler.input.1447896726">
 					<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
 					<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
 						<buildOutputProvider>
@@ -238,7 +330,7 @@
 							<parser enabled="true"/>
 						</buildOutputProvider>
 						<scannerInfoProvider id="makefileGenerator">
-							<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+							<runAction arguments="-E -P -v -dD" command="" useDefault="true"/>
 							<parser enabled="true"/>
 						</scannerInfoProvider>
 					</profile>
@@ -303,7 +395,7 @@
 						</scannerInfoProvider>
 					</profile>
 				</scannerConfigBuildInfo>
-				<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.osp.gnu.arm.lib.simul.1611426355;cdt.managedbuild.config.osp.gnu.arm.lib.simul.1611426355.;cdt.managedbuild.tool.osp.gnu.simul.cpp.compiler.lib.simul.19531877;cdt.managedbuild.tool.osp.gnu.cpp.compiler.input.2021001707">
+				<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.osp.gnu.target.so.debug.1191634796;cdt.managedbuild.config.osp.gnu.target.so.debug.1191634796.;cdt.managedbuild.tool.osp.gnu.target.cpp.compiler.so.debug.1064963857;cdt.managedbuild.tool.osp.gnu.cpp.compiler.input.1952294255">
 					<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"/>
 					<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
 						<buildOutputProvider>
@@ -321,90 +413,7 @@
 							<parser enabled="true"/>
 						</buildOutputProvider>
 						<scannerInfoProvider id="makefileGenerator">
-							<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
-							<parser enabled="true"/>
-						</scannerInfoProvider>
-					</profile>
-					<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
-						<buildOutputProvider>
-							<openAction enabled="true" filePath=""/>
-							<parser enabled="true"/>
-						</buildOutputProvider>
-						<scannerInfoProvider id="specsFile">
-							<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-							<parser enabled="true"/>
-						</scannerInfoProvider>
-					</profile>
-					<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
-						<buildOutputProvider>
-							<openAction enabled="true" filePath=""/>
-							<parser enabled="true"/>
-						</buildOutputProvider>
-						<scannerInfoProvider id="specsFile">
-							<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-							<parser enabled="true"/>
-						</scannerInfoProvider>
-					</profile>
-					<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
-						<buildOutputProvider>
-							<openAction enabled="true" filePath=""/>
-							<parser enabled="true"/>
-						</buildOutputProvider>
-						<scannerInfoProvider id="specsFile">
-							<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-							<parser enabled="true"/>
-						</scannerInfoProvider>
-					</profile>
-					<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
-						<buildOutputProvider>
-							<openAction enabled="true" filePath=""/>
-							<parser enabled="true"/>
-						</buildOutputProvider>
-						<scannerInfoProvider id="specsFile">
-							<runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/${specs_file}&quot;'" command="sh" useDefault="true"/>
-							<parser enabled="true"/>
-						</scannerInfoProvider>
-					</profile>
-					<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
-						<buildOutputProvider>
-							<openAction enabled="true" filePath=""/>
-							<parser enabled="true"/>
-						</buildOutputProvider>
-						<scannerInfoProvider id="specsFile">
-							<runAction arguments="-c 'g++ -E -P -v -dD &quot;${plugin_state_location}/specs.cpp&quot;'" command="sh" useDefault="true"/>
-							<parser enabled="true"/>
-						</scannerInfoProvider>
-					</profile>
-					<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
-						<buildOutputProvider>
-							<openAction enabled="true" filePath=""/>
-							<parser enabled="true"/>
-						</buildOutputProvider>
-						<scannerInfoProvider id="specsFile">
-							<runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/specs.c&quot;'" command="sh" useDefault="true"/>
-							<parser enabled="true"/>
-						</scannerInfoProvider>
-					</profile>
-				</scannerConfigBuildInfo>
-				<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.osp.gnu.target.lib.debug.1627292273;cdt.managedbuild.config.osp.gnu.target.lib.debug.1627292273.;cdt.managedbuild.tool.osp.gnu.target.cpp.compiler.lib.debug.890640682;cdt.managedbuild.tool.osp.gnu.cpp.compiler.input.1151794390">
-					<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"/>
-					<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
-						<buildOutputProvider>
-							<openAction enabled="true" filePath=""/>
-							<parser enabled="true"/>
-						</buildOutputProvider>
-						<scannerInfoProvider id="specsFile">
-							<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-							<parser enabled="true"/>
-						</scannerInfoProvider>
-					</profile>
-					<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
-						<buildOutputProvider>
-							<openAction enabled="true" filePath=""/>
-							<parser enabled="true"/>
-						</buildOutputProvider>
-						<scannerInfoProvider id="makefileGenerator">
-							<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+							<runAction arguments="-E -P -v -dD" command="" useDefault="true"/>
 							<parser enabled="true"/>
 						</scannerInfoProvider>
 					</profile>
@@ -470,9 +479,10 @@
 					</profile>
 				</scannerConfigBuildInfo>
 			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
 		</cconfiguration>
-		<cconfiguration id="cdt.managedbuild.config.osp.gnu.target.lib.release.65542412">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.osp.gnu.target.lib.release.65542412" moduleId="org.eclipse.cdt.core.settings" name="Target-Release">
+		<cconfiguration id="cdt.managedbuild.config.osp.gnu.target.so.release.284388679">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.osp.gnu.target.so.release.284388679" moduleId="org.eclipse.cdt.core.settings" name="Target-Release">
 				<externalSettings>
 					<externalSetting>
 						<entry flags="VALUE_WORKSPACE_PATH" kind="includePath" name="/CocosDenshion"/>
@@ -492,37 +502,45 @@
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="a" artifactName="CocosDenshion" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.staticLib" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.staticLib" cleanCommand="rm -rf" description="" errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser" id="cdt.managedbuild.config.osp.gnu.target.lib.release.65542412" name="Target-Release" parent="cdt.managedbuild.config.osp.gnu.target.lib.release">
-					<folderInfo id="cdt.managedbuild.config.osp.gnu.target.lib.release.65542412." name="/" resourcePath="">
-						<toolChain id="cdt.managedbuild.toolchain.osp.gnu.target.lib.release.292779726" name="bada GCC ToolChain" superClass="cdt.managedbuild.toolchain.osp.gnu.target.lib.release">
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.Cygwin_PE;org.eclipse.cdt.core.GNU_ELF;org.eclipse.cdt.core.ELF" id="cdt.managedbuild.target.osp.gnu.target.platform.lib.release.736735404" name="Debug Platform" osList="osp" superClass="cdt.managedbuild.target.osp.gnu.target.platform.lib.release"/>
-							<builder buildPath="${workspace_loc:/CocosDenshion/.Target-Release}" command="cs-make" id="cdt.managedbuild.target.osp.gnu.target.builder.lib.release.136543538" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="bada Builder" superClass="cdt.managedbuild.target.osp.gnu.target.builder.lib.release"/>
-							<tool id="cdt.managedbuild.tool.osp.gnu.target.archiver.lib.release.2021765599" name="bada Archiver" superClass="cdt.managedbuild.tool.osp.gnu.target.archiver.lib.release"/>
-							<tool id="cdt.managedbuild.tool.osp.gnu.target.cpp.compiler.lib.release.1999265811" name="bada C++ Compiler" superClass="cdt.managedbuild.tool.osp.gnu.target.cpp.compiler.lib.release">
-								<option id="osp.gnu.target.cpp.compiler.release.lib.option.include.paths.1384388317" name="Include paths (-I)" superClass="osp.gnu.target.cpp.compiler.release.lib.option.include.paths" valueType="includePath">
+				<configuration artifactExtension="so" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.sharedLib" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.sharedLib" cleanCommand="rm -rf" description="" errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser" id="cdt.managedbuild.config.osp.gnu.target.so.release.284388679" name="Target-Release" parent="cdt.managedbuild.config.osp.gnu.target.so.release">
+					<folderInfo id="cdt.managedbuild.config.osp.gnu.target.so.release.284388679." name="/" resourcePath="">
+						<toolChain id="cdt.managedbuild.toolchain.osp.gnu.target.so.release.424470322" name="bada GCC ToolChain" superClass="cdt.managedbuild.toolchain.osp.gnu.target.so.release">
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.Cygwin_PE;org.eclipse.cdt.core.GNU_ELF;org.eclipse.cdt.core.ELF" id="cdt.managedbuild.target.osp.gnu.target.platform.so.release.1004288437" name="Debug Platform" osList="osp" superClass="cdt.managedbuild.target.osp.gnu.target.platform.so.release"/>
+							<builder buildPath="${workspace_loc:/CocosDenshion/.Target-Release}" command="cs-make" id="cdt.managedbuild.target.osp.gnu.target.builder.so.release.863081047" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="bada Builder" superClass="cdt.managedbuild.target.osp.gnu.target.builder.so.release"/>
+							<tool id="cdt.managedbuild.tool.osp.gnu.arm.archiver.base.282940312" name="bada Archiver" superClass="cdt.managedbuild.tool.osp.gnu.arm.archiver.base"/>
+							<tool id="cdt.managedbuild.tool.osp.gnu.target.cpp.compiler.so.release.2122538510" name="bada C++ Compiler" superClass="cdt.managedbuild.tool.osp.gnu.target.cpp.compiler.so.release">
+								<option id="osp.gnu.target.cpp.compiler.release.so.option.preprocessor.def.1775032617" name="Defined symbols (-D)" superClass="osp.gnu.target.cpp.compiler.release.so.option.preprocessor.def" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="SHP"/>
+									<listOptionValue builtIn="false" value="CC_BADA_2_0"/>
+								</option>
+								<option id="osp.gnu.target.cpp.compiler.release.so.option.include.paths.620428582" superClass="osp.gnu.target.cpp.compiler.release.so.option.include.paths" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${SDKROOT}/include&quot;"/>
 									<listOptionValue builtIn="false" value="../../../include"/>
 								</option>
-								<inputType id="cdt.managedbuild.tool.osp.gnu.cpp.compiler.input.1216844156" superClass="cdt.managedbuild.tool.osp.gnu.cpp.compiler.input"/>
+								<inputType id="cdt.managedbuild.tool.osp.gnu.cpp.compiler.input.437912108" superClass="cdt.managedbuild.tool.osp.gnu.cpp.compiler.input"/>
 							</tool>
-							<tool id="cdt.managedbuild.tool.osp.gnu.target.c.compiler.lib.release.630979711" name="bada C Compiler" superClass="cdt.managedbuild.tool.osp.gnu.target.c.compiler.lib.release">
-								<inputType id="cdt.managedbuild.tool.osp.gnu.c.compiler.input.1596240049" superClass="cdt.managedbuild.tool.osp.gnu.c.compiler.input"/>
+							<tool id="cdt.managedbuild.tool.osp.gnu.target.c.compiler.so.release.12061378" name="bada C Compiler" superClass="cdt.managedbuild.tool.osp.gnu.target.c.compiler.so.release">
+								<inputType id="cdt.managedbuild.tool.osp.gnu.c.compiler.input.1447896726" superClass="cdt.managedbuild.tool.osp.gnu.c.compiler.input"/>
 							</tool>
-							<tool id="cdt.managedbuild.tool.osp.gnu.arm.c.linker.base.1363172405" name="bada C Linker" superClass="cdt.managedbuild.tool.osp.gnu.arm.c.linker.base"/>
-							<tool id="cdt.managedbuild.tool.osp.gnu.arm.cpp.linker.base.2051438609" name="bada C++ Linker" superClass="cdt.managedbuild.tool.osp.gnu.arm.cpp.linker.base"/>
-							<tool id="cdt.managedbuild.tool.osp.gnu.target.assembler.lib.release.354389189" name="bada Assembler" superClass="cdt.managedbuild.tool.osp.gnu.target.assembler.lib.release">
-								<inputType id="cdt.managedbuild.tool.osp.gnu.assembler.input.1440351978" superClass="cdt.managedbuild.tool.osp.gnu.assembler.input"/>
+							<tool id="cdt.managedbuild.tool.osp.gnu.target.c.linker.so.release.1201354205" name="bada C Linker" superClass="cdt.managedbuild.tool.osp.gnu.target.c.linker.so.release"/>
+							<tool id="cdt.managedbuild.tool.osp.gnu.target.cpp.linker.so.release.184411703" name="bada C++ Linker" superClass="cdt.managedbuild.tool.osp.gnu.target.cpp.linker.so.release">
+								<inputType id="cdt.managedbuild.tool.osp.gnu.cpp.linker.input.2118565794" superClass="cdt.managedbuild.tool.osp.gnu.cpp.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="cdt.managedbuild.tool.osp.gnu.target.assembler.so.release.1654036461" name="bada Assembler" superClass="cdt.managedbuild.tool.osp.gnu.target.assembler.so.release">
+								<inputType id="cdt.managedbuild.tool.osp.gnu.assembler.input.2021051223" superClass="cdt.managedbuild.tool.osp.gnu.assembler.input"/>
 							</tool>
 						</toolChain>
 					</folderInfo>
 					<sourceEntries>
 						<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="bada"/>
+						<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="include"/>
 					</sourceEntries>
 				</configuration>
 			</storageModule>
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-			<storageModule moduleId="org.eclipse.cdt.core.language.mapping"/>
-			<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
 			<storageModule moduleId="scannerConfiguration">
 				<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
 				<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
@@ -541,7 +559,7 @@
 						<parser enabled="true"/>
 					</buildOutputProvider>
 					<scannerInfoProvider id="makefileGenerator">
-						<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+						<runAction arguments="-E -P -v -dD" command="" useDefault="true"/>
 						<parser enabled="true"/>
 					</scannerInfoProvider>
 				</profile>
@@ -605,7 +623,7 @@
 						<parser enabled="true"/>
 					</scannerInfoProvider>
 				</profile>
-				<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.osp.gnu.arm.lib.simul.1611426355;cdt.managedbuild.config.osp.gnu.arm.lib.simul.1611426355.;cdt.managedbuild.tool.osp.gnu.simul.c.compiler.lib.simul.1643639387;cdt.managedbuild.tool.osp.gnu.c.compiler.input.991154682">
+				<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.osp.gnu.target.so.debug.1191634796;cdt.managedbuild.config.osp.gnu.target.so.debug.1191634796.;cdt.managedbuild.tool.osp.gnu.target.c.compiler.so.debug.25148670;cdt.managedbuild.tool.osp.gnu.c.compiler.input.1332966355">
 					<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
 					<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
 						<buildOutputProvider>
@@ -623,7 +641,7 @@
 							<parser enabled="true"/>
 						</buildOutputProvider>
 						<scannerInfoProvider id="makefileGenerator">
-							<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+							<runAction arguments="-E -P -v -dD" command="" useDefault="true"/>
 							<parser enabled="true"/>
 						</scannerInfoProvider>
 					</profile>
@@ -688,7 +706,90 @@
 						</scannerInfoProvider>
 					</profile>
 				</scannerConfigBuildInfo>
-				<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.osp.gnu.target.lib.debug.1627292273;cdt.managedbuild.config.osp.gnu.target.lib.debug.1627292273.;cdt.managedbuild.tool.osp.gnu.target.c.compiler.lib.debug.1600003830;cdt.managedbuild.tool.osp.gnu.c.compiler.input.2067434681">
+				<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.osp.gnu.target.so.release.284388679;cdt.managedbuild.config.osp.gnu.target.so.release.284388679.;cdt.managedbuild.tool.osp.gnu.target.cpp.compiler.so.release.2122538510;cdt.managedbuild.tool.osp.gnu.cpp.compiler.input.437912108">
+					<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"/>
+					<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+						<buildOutputProvider>
+							<openAction enabled="true" filePath=""/>
+							<parser enabled="true"/>
+						</buildOutputProvider>
+						<scannerInfoProvider id="specsFile">
+							<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+							<parser enabled="true"/>
+						</scannerInfoProvider>
+					</profile>
+					<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+						<buildOutputProvider>
+							<openAction enabled="true" filePath=""/>
+							<parser enabled="true"/>
+						</buildOutputProvider>
+						<scannerInfoProvider id="makefileGenerator">
+							<runAction arguments="-E -P -v -dD" command="" useDefault="true"/>
+							<parser enabled="true"/>
+						</scannerInfoProvider>
+					</profile>
+					<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+						<buildOutputProvider>
+							<openAction enabled="true" filePath=""/>
+							<parser enabled="true"/>
+						</buildOutputProvider>
+						<scannerInfoProvider id="specsFile">
+							<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+							<parser enabled="true"/>
+						</scannerInfoProvider>
+					</profile>
+					<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+						<buildOutputProvider>
+							<openAction enabled="true" filePath=""/>
+							<parser enabled="true"/>
+						</buildOutputProvider>
+						<scannerInfoProvider id="specsFile">
+							<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+							<parser enabled="true"/>
+						</scannerInfoProvider>
+					</profile>
+					<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+						<buildOutputProvider>
+							<openAction enabled="true" filePath=""/>
+							<parser enabled="true"/>
+						</buildOutputProvider>
+						<scannerInfoProvider id="specsFile">
+							<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+							<parser enabled="true"/>
+						</scannerInfoProvider>
+					</profile>
+					<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+						<buildOutputProvider>
+							<openAction enabled="true" filePath=""/>
+							<parser enabled="true"/>
+						</buildOutputProvider>
+						<scannerInfoProvider id="specsFile">
+							<runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/${specs_file}&quot;'" command="sh" useDefault="true"/>
+							<parser enabled="true"/>
+						</scannerInfoProvider>
+					</profile>
+					<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+						<buildOutputProvider>
+							<openAction enabled="true" filePath=""/>
+							<parser enabled="true"/>
+						</buildOutputProvider>
+						<scannerInfoProvider id="specsFile">
+							<runAction arguments="-c 'g++ -E -P -v -dD &quot;${plugin_state_location}/specs.cpp&quot;'" command="sh" useDefault="true"/>
+							<parser enabled="true"/>
+						</scannerInfoProvider>
+					</profile>
+					<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+						<buildOutputProvider>
+							<openAction enabled="true" filePath=""/>
+							<parser enabled="true"/>
+						</buildOutputProvider>
+						<scannerInfoProvider id="specsFile">
+							<runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/specs.c&quot;'" command="sh" useDefault="true"/>
+							<parser enabled="true"/>
+						</scannerInfoProvider>
+					</profile>
+				</scannerConfigBuildInfo>
+				<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.osp.gnu.target.so.release.284388679;cdt.managedbuild.config.osp.gnu.target.so.release.284388679.;cdt.managedbuild.tool.osp.gnu.target.c.compiler.so.release.12061378;cdt.managedbuild.tool.osp.gnu.c.compiler.input.1447896726">
 					<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
 					<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
 						<buildOutputProvider>
@@ -706,7 +807,7 @@
 							<parser enabled="true"/>
 						</buildOutputProvider>
 						<scannerInfoProvider id="makefileGenerator">
-							<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+							<runAction arguments="-E -P -v -dD" command="" useDefault="true"/>
 							<parser enabled="true"/>
 						</scannerInfoProvider>
 					</profile>
@@ -771,7 +872,7 @@
 						</scannerInfoProvider>
 					</profile>
 				</scannerConfigBuildInfo>
-				<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.osp.gnu.arm.lib.simul.1611426355;cdt.managedbuild.config.osp.gnu.arm.lib.simul.1611426355.;cdt.managedbuild.tool.osp.gnu.simul.cpp.compiler.lib.simul.19531877;cdt.managedbuild.tool.osp.gnu.cpp.compiler.input.2021001707">
+				<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.osp.gnu.target.so.debug.1191634796;cdt.managedbuild.config.osp.gnu.target.so.debug.1191634796.;cdt.managedbuild.tool.osp.gnu.target.cpp.compiler.so.debug.1064963857;cdt.managedbuild.tool.osp.gnu.cpp.compiler.input.1952294255">
 					<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"/>
 					<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
 						<buildOutputProvider>
@@ -789,90 +890,7 @@
 							<parser enabled="true"/>
 						</buildOutputProvider>
 						<scannerInfoProvider id="makefileGenerator">
-							<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
-							<parser enabled="true"/>
-						</scannerInfoProvider>
-					</profile>
-					<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
-						<buildOutputProvider>
-							<openAction enabled="true" filePath=""/>
-							<parser enabled="true"/>
-						</buildOutputProvider>
-						<scannerInfoProvider id="specsFile">
-							<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-							<parser enabled="true"/>
-						</scannerInfoProvider>
-					</profile>
-					<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
-						<buildOutputProvider>
-							<openAction enabled="true" filePath=""/>
-							<parser enabled="true"/>
-						</buildOutputProvider>
-						<scannerInfoProvider id="specsFile">
-							<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-							<parser enabled="true"/>
-						</scannerInfoProvider>
-					</profile>
-					<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
-						<buildOutputProvider>
-							<openAction enabled="true" filePath=""/>
-							<parser enabled="true"/>
-						</buildOutputProvider>
-						<scannerInfoProvider id="specsFile">
-							<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-							<parser enabled="true"/>
-						</scannerInfoProvider>
-					</profile>
-					<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
-						<buildOutputProvider>
-							<openAction enabled="true" filePath=""/>
-							<parser enabled="true"/>
-						</buildOutputProvider>
-						<scannerInfoProvider id="specsFile">
-							<runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/${specs_file}&quot;'" command="sh" useDefault="true"/>
-							<parser enabled="true"/>
-						</scannerInfoProvider>
-					</profile>
-					<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
-						<buildOutputProvider>
-							<openAction enabled="true" filePath=""/>
-							<parser enabled="true"/>
-						</buildOutputProvider>
-						<scannerInfoProvider id="specsFile">
-							<runAction arguments="-c 'g++ -E -P -v -dD &quot;${plugin_state_location}/specs.cpp&quot;'" command="sh" useDefault="true"/>
-							<parser enabled="true"/>
-						</scannerInfoProvider>
-					</profile>
-					<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
-						<buildOutputProvider>
-							<openAction enabled="true" filePath=""/>
-							<parser enabled="true"/>
-						</buildOutputProvider>
-						<scannerInfoProvider id="specsFile">
-							<runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/specs.c&quot;'" command="sh" useDefault="true"/>
-							<parser enabled="true"/>
-						</scannerInfoProvider>
-					</profile>
-				</scannerConfigBuildInfo>
-				<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.osp.gnu.target.lib.debug.1627292273;cdt.managedbuild.config.osp.gnu.target.lib.debug.1627292273.;cdt.managedbuild.tool.osp.gnu.target.cpp.compiler.lib.debug.890640682;cdt.managedbuild.tool.osp.gnu.cpp.compiler.input.1151794390">
-					<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"/>
-					<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
-						<buildOutputProvider>
-							<openAction enabled="true" filePath=""/>
-							<parser enabled="true"/>
-						</buildOutputProvider>
-						<scannerInfoProvider id="specsFile">
-							<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-							<parser enabled="true"/>
-						</scannerInfoProvider>
-					</profile>
-					<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
-						<buildOutputProvider>
-							<openAction enabled="true" filePath=""/>
-							<parser enabled="true"/>
-						</buildOutputProvider>
-						<scannerInfoProvider id="makefileGenerator">
-							<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+							<runAction arguments="-E -P -v -dD" command="" useDefault="true"/>
 							<parser enabled="true"/>
 						</scannerInfoProvider>
 					</profile>
@@ -938,9 +956,10 @@
 					</profile>
 				</scannerConfigBuildInfo>
 			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
 		</cconfiguration>
 	</storageModule>
 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-		<project id="CocosDenshion.cdt.managedbuild.target.osp.gnu.arm.lib.533692282" name="Static Library" projectType="cdt.managedbuild.target.osp.gnu.arm.lib"/>
+		<project id="CocosDenshion.cdt.managedbuild.target.osp.gnu.arm.so.1357990848" name="Shared Library" projectType="cdt.managedbuild.target.osp.gnu.arm.so"/>
 	</storageModule>
 </cproject>
diff --git a/CocosDenshion/proj.bada/sdk2.0/.project b/CocosDenshion/proj.bada/sdk2.0/.project
index 000de0c5e1..f98cb0f6e1 100644
--- a/CocosDenshion/proj.bada/sdk2.0/.project
+++ b/CocosDenshion/proj.bada/sdk2.0/.project
@@ -31,7 +31,7 @@
 				</dictionary>
 				<dictionary>
 					<key>org.eclipse.cdt.make.core.buildLocation</key>
-					<value>${workspace_loc:/CocosDenshion/.Simulator-Debug}</value>
+					<value>${workspace_loc:/CocosDenshion/.Target-Debug}</value>
 				</dictionary>
 				<dictionary>
 					<key>org.eclipse.cdt.make.core.cleanBuildTarget</key>
@@ -69,6 +69,7 @@
 		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<triggers>full,incremental,</triggers>
 			<arguments>
 			</arguments>
 		</buildCommand>
diff --git a/HelloWorld/bada/sdk1.0/.cproject b/HelloWorld/bada/sdk1.0/.cproject
index a497d87311..d4cb592467 100644
--- a/HelloWorld/bada/sdk1.0/.cproject
+++ b/HelloWorld/bada/sdk1.0/.cproject
@@ -32,10 +32,13 @@
 <tool id="cdt.managedbuild.tool.osp.gnu.simul.cpp.compiler.exe.simul.1578617969" name="bada C++ Compiler" superClass="cdt.managedbuild.tool.osp.gnu.simul.cpp.compiler.exe.simul">
 <option id="osp.gnu.cpp.compiler.simual.exe.option.include.paths.723348878" name="Include paths (-I)" superClass="osp.gnu.cpp.compiler.simual.exe.option.include.paths" valueType="includePath">
 <listOptionValue builtIn="false" value="&quot;${SDKROOT}/include&quot;"/>
+<listOptionValue builtIn="false" value="../../../../"/>
 <listOptionValue builtIn="false" value="../../../../cocos2dx"/>
 <listOptionValue builtIn="false" value="../../../../cocos2dx/include"/>
 <listOptionValue builtIn="false" value="../../../../cocos2dx/platform"/>
 <listOptionValue builtIn="false" value="../../../../cocos2dx/platform/bada"/>
+<listOptionValue builtIn="false" value="../../../../chipmunk/include/chipmunk"/>
+<listOptionValue builtIn="false" value="../../../../CocosDenshion/include"/>
 </option>
 <inputType id="cdt.managedbuild.tool.osp.gnu.cpp.compiler.input.1554655425" superClass="cdt.managedbuild.tool.osp.gnu.cpp.compiler.input"/>
 </tool>
@@ -47,6 +50,7 @@
 <option id="osp.gnu.cpp.link.simual.debug.option.libs.985039748" name="Libraries (-l)" superClass="osp.gnu.cpp.link.simual.debug.option.libs" valueType="libs">
 <listOptionValue builtIn="false" value="osp_rt0"/>
 <listOptionValue builtIn="false" value="cocos2dx"/>
+<listOptionValue builtIn="false" value="CocosDenshion"/>
 <listOptionValue builtIn="false" value="libc-newlib"/>
 <listOptionValue builtIn="false" value="FOsp"/>
 <listOptionValue builtIn="false" value="FGraphicsOpengl"/>
@@ -57,6 +61,10 @@
 <listOptionValue builtIn="false" value="&quot;${SDKROOT}/Lib&quot;"/>
 <listOptionValue builtIn="false" value="&quot;${PROJECT_ROOT}/lib&quot;"/>
 </option>
+<option id="osp.gnu.cpp.link.option.userobjs.982886296" name="Other objects" superClass="osp.gnu.cpp.link.option.userobjs" valueType="userObjs">
+<listOptionValue builtIn="false" value="../../../../Box2D/proj.bada/sdk1.0/.Simulator-Debug/libBox2D.a"/>
+<listOptionValue builtIn="false" value="../../../../chipmunk/proj.bada/sdk1.0/.Simulator-Debug/libchipmunk.a"/>
+</option>
 <inputType id="cdt.managedbuild.tool.osp.gnu.cpp.linker.input.543292516" superClass="cdt.managedbuild.tool.osp.gnu.cpp.linker.input">
 <additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 <additionalInput kind="additionalinput" paths="$(LIBS)"/>
@@ -512,7 +520,7 @@
 </extensions>
 </storageModule>
 <storageModule moduleId="cdtBuildSystem" version="4.0.0">
-<configuration artifactExtension="exe" artifactName="HelloWorld" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.sharedLib" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.sharedLib" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.osp.gnu.target.exe.debug.2113673682" name="Target-Debug" parent="cdt.managedbuild.config.osp.gnu.target.exe.debug" prebuildStep="cd .. &amp; (if not exist lib mkdir lib) &amp; (copy /y ..\..\..\cocos2dx\proj.bada\sdk1.0\.Target-Debug\libcocos2dx.so lib) &amp; (if not exist Res mkdir Res) &amp; (copy /y ..\..\Resource\*.* Res)">
+<configuration artifactExtension="exe" artifactName="HelloWorld" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.sharedLib" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.sharedLib" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.osp.gnu.target.exe.debug.2113673682" name="Target-Debug" parent="cdt.managedbuild.config.osp.gnu.target.exe.debug" prebuildStep="cd .. &amp; (if not exist lib mkdir lib) &amp; (copy /y ..\..\..\cocos2dx\proj.bada\sdk1.0\.Target-Debug\libcocos2dx.so lib) &amp; (copy /y ..\..\..\CocosDenshion\proj.bada\sdk1.0\.Target-Debug\libCocosDenshion.so lib) &amp; (if not exist Res mkdir Res) &amp; (copy /y ..\..\Resource\*.* Res)">
 <folderInfo id="cdt.managedbuild.config.osp.gnu.target.exe.debug.2113673682." name="/" resourcePath="">
 <toolChain id="cdt.managedbuild.toolchain.osp.gnu.target.exe.debug.2127488964" name="bada GCC ToolChain" superClass="cdt.managedbuild.toolchain.osp.gnu.target.exe.debug">
 <targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.Cygwin_PE;org.eclipse.cdt.core.GNU_ELF;org.eclipse.cdt.core.ELF" id="cdt.managedbuild.target.osp.gnu.target.platform.exe.debug.1117105675" name="Debug Platform" osList="osp" superClass="cdt.managedbuild.target.osp.gnu.target.platform.exe.debug"/>
@@ -521,10 +529,13 @@
 <tool id="cdt.managedbuild.tool.osp.gnu.target.cpp.compiler.exe.debug.1042444633" name="bada C++ Compiler" superClass="cdt.managedbuild.tool.osp.gnu.target.cpp.compiler.exe.debug">
 <option id="osp.gnu.target.cpp.compiler.debug.exe.option.include.paths.1118027441" name="Include paths (-I)" superClass="osp.gnu.target.cpp.compiler.debug.exe.option.include.paths" valueType="includePath">
 <listOptionValue builtIn="false" value="&quot;${SDKROOT}/include&quot;"/>
+<listOptionValue builtIn="false" value="../../../../"/>
 <listOptionValue builtIn="false" value="../../../../cocos2dx"/>
 <listOptionValue builtIn="false" value="../../../../cocos2dx/include"/>
 <listOptionValue builtIn="false" value="../../../../cocos2dx/platform"/>
 <listOptionValue builtIn="false" value="../../../../cocos2dx/platform/bada"/>
+<listOptionValue builtIn="false" value="../../../../chipmunk/include/chipmunk"/>
+<listOptionValue builtIn="false" value="../../../../CocosDenshion/include"/>
 </option>
 <inputType id="cdt.managedbuild.tool.osp.gnu.cpp.compiler.input.1707579424" superClass="cdt.managedbuild.tool.osp.gnu.cpp.compiler.input"/>
 </tool>
@@ -535,6 +546,7 @@
 <tool id="cdt.managedbuild.tool.osp.gnu.target.cpp.linker.exe.debug.1747969474" name="bada C++ Linker" superClass="cdt.managedbuild.tool.osp.gnu.target.cpp.linker.exe.debug">
 <option id="osp.gnu.target.cpp.link.debug.exe.option.libs.2056672880" name="Libraries (-l)" superClass="osp.gnu.target.cpp.link.debug.exe.option.libs" valueType="libs">
 <listOptionValue builtIn="false" value="cocos2dx"/>
+<listOptionValue builtIn="false" value="CocosDenshion"/>
 </option>
 <option id="osp.gnu.target.cpp.link.debug.exe.option.libs.paths.1078498225" name="Library search path (-L)" superClass="osp.gnu.target.cpp.link.debug.exe.option.libs.paths" valueType="libPaths">
 <listOptionValue builtIn="false" value="&quot;${TARGET_LIB_PATH}&quot;"/>
@@ -544,6 +556,8 @@
 </option>
 <option id="osp.gnu.target.cpp.link.debug.exe.option.userobjs.807623096" name="Other objects" superClass="osp.gnu.target.cpp.link.debug.exe.option.userobjs" valueType="userObjs">
 <listOptionValue builtIn="false" value="&quot;${TARGET_LIB_PATH}/osp_rt0.a&quot;"/>
+<listOptionValue builtIn="false" value="../../../../Box2D/proj.bada/sdk1.0/.Target-Debug/libBox2D.a"/>
+<listOptionValue builtIn="false" value="../../../../chipmunk/proj.bada/sdk1.0/.Target-Debug/libchipmunk.a"/>
 <listOptionValue builtIn="false" value="&quot;${TARGET_LIB_PATH}/libc-newlib.so&quot;"/>
 <listOptionValue builtIn="false" value="&quot;${TARGET_LIB_PATH}/libm-newlib.so&quot;"/>
 <listOptionValue builtIn="false" value="&quot;${TARGET_LIB_PATH}/FOsp.so&quot;"/>
@@ -1006,7 +1020,7 @@
 </extensions>
 </storageModule>
 <storageModule moduleId="cdtBuildSystem" version="4.0.0">
-<configuration artifactExtension="exe" artifactName="HelloWorld" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.sharedLib" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.sharedLib" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.osp.gnu.target.exe.release.882869284" name="Target-Release" parent="cdt.managedbuild.config.osp.gnu.target.exe.release" prebuildStep="cd .. &amp; (if not exist lib mkdir lib) &amp; (copy /y ..\..\..\cocos2dx\proj.bada\sdk1.0\.Target-Release\libcocos2dx.so lib) &amp; (if not exist Res mkdir Res) &amp; (copy /y ..\..\Resource\*.* Res)">
+<configuration artifactExtension="exe" artifactName="HelloWorld" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.sharedLib" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.sharedLib" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.osp.gnu.target.exe.release.882869284" name="Target-Release" parent="cdt.managedbuild.config.osp.gnu.target.exe.release" prebuildStep="cd .. &amp; (if not exist lib mkdir lib) &amp; (copy /y ..\..\..\cocos2dx\proj.bada\sdk1.0\.Target-Release\libcocos2dx.so lib) &amp; (copy /y ..\..\..\CocosDenshion\proj.bada\sdk1.0\.Target-Release\libCocosDenshion.so lib) &amp; (if not exist Res mkdir Res) &amp; (copy /y ..\..\Resource\*.* Res)">
 <folderInfo id="cdt.managedbuild.config.osp.gnu.target.exe.release.882869284." name="/" resourcePath="">
 <toolChain id="cdt.managedbuild.toolchain.osp.gnu.target.target.exe.release.641425882" name="bada GCC ToolChain" superClass="cdt.managedbuild.toolchain.osp.gnu.target.target.exe.release">
 <targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.Cygwin_PE;org.eclipse.cdt.core.GNU_ELF;org.eclipse.cdt.core.ELF" id="cdt.managedbuild.target.osp.gnu.target.platform.exe.release.1305983074" name="Release Platform" osList="osp" superClass="cdt.managedbuild.target.osp.gnu.target.platform.exe.release"/>
@@ -1015,10 +1029,13 @@
 <tool id="cdt.managedbuild.tool.osp.gnu.target.cpp.compiler.exe.release.2090797071" name="bada C++ Compiler" superClass="cdt.managedbuild.tool.osp.gnu.target.cpp.compiler.exe.release">
 <option id="osp.gnu.target.cpp.compiler.release.exe.option.include.paths.1779725734" name="Include paths (-I)" superClass="osp.gnu.target.cpp.compiler.release.exe.option.include.paths" valueType="includePath">
 <listOptionValue builtIn="false" value="&quot;${SDKROOT}/include&quot;"/>
+<listOptionValue builtIn="false" value="../../../../"/>
 <listOptionValue builtIn="false" value="../../../../cocos2dx"/>
 <listOptionValue builtIn="false" value="../../../../cocos2dx/include"/>
 <listOptionValue builtIn="false" value="../../../../cocos2dx/platform"/>
 <listOptionValue builtIn="false" value="../../../../cocos2dx/platform/bada"/>
+<listOptionValue builtIn="false" value="../../../../chipmunk/include/chipmunk"/>
+<listOptionValue builtIn="false" value="../../../../CocosDenshion/include"/>
 </option>
 <inputType id="cdt.managedbuild.tool.osp.gnu.cpp.compiler.input.1869011242" superClass="cdt.managedbuild.tool.osp.gnu.cpp.compiler.input"/>
 </tool>
@@ -1029,6 +1046,7 @@
 <tool id="cdt.managedbuild.tool.osp.gnu.target.cpp.linker.exe.release.1446379106" name="bada C++ Linker" superClass="cdt.managedbuild.tool.osp.gnu.target.cpp.linker.exe.release">
 <option id="osp.gnu.target.cpp.link.release.exe.option.libs.902896095" name="Libraries (-l)" superClass="osp.gnu.target.cpp.link.release.exe.option.libs" valueType="libs">
 <listOptionValue builtIn="false" value="cocos2dx"/>
+<listOptionValue builtIn="false" value="CocosDenshion"/>
 </option>
 <option id="osp.gnu.target.cpp.link.release.exe.option.libs.paths.1336107112" name="Library search path (-L)" superClass="osp.gnu.target.cpp.link.release.exe.option.libs.paths" valueType="libPaths">
 <listOptionValue builtIn="false" value="&quot;${TARGET_LIB_PATH}&quot;"/>
@@ -1038,6 +1056,8 @@
 </option>
 <option id="osp.gnu.target.cpp.link.release.exe.option.userobjs.2051939147" name="Other objects" superClass="osp.gnu.target.cpp.link.release.exe.option.userobjs" valueType="userObjs">
 <listOptionValue builtIn="false" value="&quot;${TARGET_LIB_PATH}/osp_rt0.a&quot;"/>
+<listOptionValue builtIn="false" value="../../../../Box2D/proj.bada/sdk1.0/.Target-Release/libBox2D.a"/>
+<listOptionValue builtIn="false" value="../../../../chipmunk/proj.bada/sdk1.0/.Target-Release/libchipmunk.a"/>
 <listOptionValue builtIn="false" value="&quot;${TARGET_LIB_PATH}/libc-newlib.so&quot;"/>
 <listOptionValue builtIn="false" value="&quot;${TARGET_LIB_PATH}/libm-newlib.so&quot;"/>
 <listOptionValue builtIn="false" value="&quot;${TARGET_LIB_PATH}/FOsp.so&quot;"/>
diff --git a/HelloWorld/bada/sdk2.0/.badaprj b/HelloWorld/bada/sdk2.0/.badaprj
index c84f00ca3b..3435da725a 100644
--- a/HelloWorld/bada/sdk2.0/.badaprj
+++ b/HelloWorld/bada/sdk2.0/.badaprj
@@ -2,7 +2,7 @@
 <bada>
     <type>0</type>
     <sdk>C:\bada\2.0.2</sdk>
-    <model>WaveWVGA</model>
+    <model>WaveHVGA</model>
     <apiversioncheck>true</apiversioncheck>
     <priviligecheck>false</priviligecheck>
     <properties/>
diff --git a/HelloWorld/bada/sdk2.0/.cproject b/HelloWorld/bada/sdk2.0/.cproject
index 2991f67874..9403ec644f 100644
--- a/HelloWorld/bada/sdk2.0/.cproject
+++ b/HelloWorld/bada/sdk2.0/.cproject
@@ -24,7 +24,7 @@
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="exe" artifactName="HelloWorld" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.sharedLib" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.sharedLib" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.osp.gnu.target.exe.debug.2113673682" name="Target-Debug" parent="cdt.managedbuild.config.osp.gnu.target.exe.debug" prebuildStep="cd .. &amp; (if not exist lib mkdir lib) &amp; copy /y ..\..\..\cocos2dx\proj.bada\sdk2.0\.Target-Debug\libcocos2dx.so lib">
+				<configuration artifactExtension="exe" artifactName="HelloWorld" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.sharedLib" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.sharedLib" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.osp.gnu.target.exe.debug.2113673682" name="Target-Debug" parent="cdt.managedbuild.config.osp.gnu.target.exe.debug" prebuildStep="cd .. &amp; (if not exist lib mkdir lib) &amp; (copy /y ..\..\..\cocos2dx\proj.bada\sdk2.0\.Target-Debug\libcocos2dx.so lib) &amp; (copy /y ..\..\..\CocosDenshion\proj.bada\sdk2.0\.Target-Debug\libCocosDenshion.so lib) &amp; (if not exist Res mkdir Res) &amp; (copy /y ..\..\Resource\*.* Res)">
 					<folderInfo id="cdt.managedbuild.config.osp.gnu.target.exe.debug.2113673682." name="/" resourcePath="">
 						<toolChain id="cdt.managedbuild.toolchain.osp.gnu.target.exe.debug.2127488964" name="bada GCC ToolChain" superClass="cdt.managedbuild.toolchain.osp.gnu.target.exe.debug">
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.Cygwin_PE;org.eclipse.cdt.core.GNU_ELF;org.eclipse.cdt.core.ELF" id="cdt.managedbuild.target.osp.gnu.target.platform.exe.debug.1117105675" name="Debug Platform" osList="osp" superClass="cdt.managedbuild.target.osp.gnu.target.platform.exe.debug"/>
@@ -33,10 +33,13 @@
 							<tool id="cdt.managedbuild.tool.osp.gnu.target.cpp.compiler.exe.debug.1042444633" name="bada C++ Compiler" superClass="cdt.managedbuild.tool.osp.gnu.target.cpp.compiler.exe.debug">
 								<option id="osp.gnu.target.cpp.compiler.debug.exe.option.include.paths.1118027441" name="Include paths (-I)" superClass="osp.gnu.target.cpp.compiler.debug.exe.option.include.paths" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${SDKROOT}/include&quot;"/>
+									<listOptionValue builtIn="false" value="../../../../"/>
 									<listOptionValue builtIn="false" value="../../../../cocos2dx"/>
 									<listOptionValue builtIn="false" value="../../../../cocos2dx/include"/>
 									<listOptionValue builtIn="false" value="../../../../cocos2dx/platform"/>
 									<listOptionValue builtIn="false" value="../../../../cocos2dx/platform/bada"/>
+									<listOptionValue builtIn="false" value="../../../../chipmunk/include/chipmunk"/>
+									<listOptionValue builtIn="false" value="../../../../CocosDenshion/include"/>
 								</option>
 								<option id="osp.gnu.target.cpp.compiler.debug.exe.option.preprocessor.def.334903464" name="Defined symbols (-D)" superClass="osp.gnu.target.cpp.compiler.debug.exe.option.preprocessor.def" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="_DEBUG"/>
@@ -52,13 +55,20 @@
 							<tool id="cdt.managedbuild.tool.osp.gnu.target.cpp.linker.exe.debug.1747969474" name="bada C++ Linker" superClass="cdt.managedbuild.tool.osp.gnu.target.cpp.linker.exe.debug">
 								<option id="osp.gnu.target.cpp.link.debug.exe.option.libs.2056672880" name="Libraries (-l)" superClass="osp.gnu.target.cpp.link.debug.exe.option.libs" valueType="libs">
 									<listOptionValue builtIn="false" value="cocos2dx"/>
+									<listOptionValue builtIn="false" value="CocosDenshion"/>
 								</option>
 								<option id="osp.gnu.target.cpp.link.debug.exe.option.libs.paths.1078498225" name="Library search path (-L)" superClass="osp.gnu.target.cpp.link.debug.exe.option.libs.paths" valueType="libPaths">
 									<listOptionValue builtIn="false" value="&quot;${TARGET_LIB_PATH}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SDKROOT}/Tools/Toolchains/ARM/arm-samsung-nucleuseabi/lib&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SDKROOT}/Tools/Toolchains/ARM/lib/gcc/arm-samsung-nucleuseabi/4.4.1&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${PROJECT_ROOT}/lib&quot;"/>
 								</option>
 								<option id="osp.gnu.target.cpp.link.debug.exe.option.userobjs.807623096" name="Other objects" superClass="osp.gnu.target.cpp.link.debug.exe.option.userobjs" valueType="userObjs">
 									<listOptionValue builtIn="false" value="&quot;${TARGET_LIB_PATH}/osp_rt0.a&quot;"/>
+									<listOptionValue builtIn="false" value="../../../../Box2D/proj.bada/sdk2.0/.Target-Debug/libBox2D.a"/>
+									<listOptionValue builtIn="false" value="../../../../chipmunk/proj.bada/sdk2.0/.Target-Debug/libchipmunk.a"/>
+									<listOptionValue builtIn="false" value="&quot;${TARGET_LIB_PATH}/libc-newlib.so&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${TARGET_LIB_PATH}/libm-newlib.so&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${TARGET_LIB_PATH}/FOsp.so&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${TARGET_LIB_PATH}/FGraphicsOpengl.so&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${TARGET_LIB_PATH}/FGraphicsEgl.so&quot;"/>
@@ -686,7 +696,7 @@
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="exe" artifactName="HelloWorld" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.sharedLib" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.sharedLib" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.osp.gnu.target.exe.release.882869284" name="Target-Release" parent="cdt.managedbuild.config.osp.gnu.target.exe.release" prebuildStep="cd .. &amp; (if not exist lib mkdir lib) &amp; copy /y ..\..\..\cocos2dx\proj.bada\sdk2.0\.Target-Release\libcocos2dx.so lib">
+				<configuration artifactExtension="exe" artifactName="HelloWorld" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.sharedLib" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.sharedLib" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.osp.gnu.target.exe.release.882869284" name="Target-Release" parent="cdt.managedbuild.config.osp.gnu.target.exe.release" prebuildStep="cd .. &amp; (if not exist lib mkdir lib) &amp; (copy /y ..\..\..\cocos2dx\proj.bada\sdk2.0\.Target-Release\libcocos2dx.so lib) &amp; (copy /y ..\..\..\CocosDenshion\proj.bada\sdk2.0\.Target-Release\libCocosDenshion.so lib) &amp; (if not exist Res mkdir Res) &amp; (copy /y ..\..\Resource\*.* Res)">
 					<folderInfo id="cdt.managedbuild.config.osp.gnu.target.exe.release.882869284." name="/" resourcePath="">
 						<toolChain id="cdt.managedbuild.toolchain.osp.gnu.target.target.exe.release.641425882" name="bada GCC ToolChain" superClass="cdt.managedbuild.toolchain.osp.gnu.target.target.exe.release">
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.Cygwin_PE;org.eclipse.cdt.core.GNU_ELF;org.eclipse.cdt.core.ELF" id="cdt.managedbuild.target.osp.gnu.target.platform.exe.release.1305983074" name="Release Platform" osList="osp" superClass="cdt.managedbuild.target.osp.gnu.target.platform.exe.release"/>
@@ -695,10 +705,17 @@
 							<tool id="cdt.managedbuild.tool.osp.gnu.target.cpp.compiler.exe.release.2090797071" name="bada C++ Compiler" superClass="cdt.managedbuild.tool.osp.gnu.target.cpp.compiler.exe.release">
 								<option id="osp.gnu.target.cpp.compiler.release.exe.option.include.paths.1779725734" name="Include paths (-I)" superClass="osp.gnu.target.cpp.compiler.release.exe.option.include.paths" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${SDKROOT}/include&quot;"/>
+									<listOptionValue builtIn="false" value="../../../../"/>
 									<listOptionValue builtIn="false" value="../../../../cocos2dx"/>
 									<listOptionValue builtIn="false" value="../../../../cocos2dx/include"/>
 									<listOptionValue builtIn="false" value="../../../../cocos2dx/platform"/>
 									<listOptionValue builtIn="false" value="../../../../cocos2dx/platform/bada"/>
+									<listOptionValue builtIn="false" value="../../../../chipmunk/include/chipmunk"/>
+									<listOptionValue builtIn="false" value="../../../../CocosDenshion/include"/>
+								</option>
+								<option id="osp.gnu.target.cpp.compiler.release.exe.option.preprocessor.def.1056983953" superClass="osp.gnu.target.cpp.compiler.release.exe.option.preprocessor.def" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="SHP"/>
+									<listOptionValue builtIn="false" value="CC_BADA_2_0"/>
 								</option>
 								<inputType id="cdt.managedbuild.tool.osp.gnu.cpp.compiler.input.1869011242" superClass="cdt.managedbuild.tool.osp.gnu.cpp.compiler.input"/>
 							</tool>
@@ -709,18 +726,18 @@
 							<tool id="cdt.managedbuild.tool.osp.gnu.target.cpp.linker.exe.release.1446379106" name="bada C++ Linker" superClass="cdt.managedbuild.tool.osp.gnu.target.cpp.linker.exe.release">
 								<option id="osp.gnu.target.cpp.link.release.exe.option.libs.902896095" name="Libraries (-l)" superClass="osp.gnu.target.cpp.link.release.exe.option.libs" valueType="libs">
 									<listOptionValue builtIn="false" value="cocos2dx"/>
-									<listOptionValue builtIn="false" value="jpeg"/>
-									<listOptionValue builtIn="false" value="zlib"/>
-									<listOptionValue builtIn="false" value="png"/>
+									<listOptionValue builtIn="false" value="CocosDenshion"/>
 								</option>
 								<option id="osp.gnu.target.cpp.link.release.exe.option.libs.paths.1336107112" name="Library search path (-L)" superClass="osp.gnu.target.cpp.link.release.exe.option.libs.paths" valueType="libPaths">
 									<listOptionValue builtIn="false" value="&quot;${TARGET_LIB_PATH}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SDKROOT}/Tools/Toolchains/ARM/arm-samsung-nucleuseabi/lib&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SDKROOT}/Tools/Toolchains/ARM/lib/gcc/arm-samsung-nucleuseabi/4.4.1&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${PROJECT_ROOT}/lib/Target-Release&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${PROJECT_ROOT}/lib&quot;"/>
 								</option>
 								<option id="osp.gnu.target.cpp.link.release.exe.option.userobjs.2051939147" name="Other objects" superClass="osp.gnu.target.cpp.link.release.exe.option.userobjs" valueType="userObjs">
 									<listOptionValue builtIn="false" value="&quot;${TARGET_LIB_PATH}/osp_rt0.a&quot;"/>
+									<listOptionValue builtIn="false" value="../../../../Box2D/proj.bada/sdk2.0/.Target-Release/libBox2D.a"/>
+									<listOptionValue builtIn="false" value="../../../../chipmunk/proj.bada/sdk2.0/.Target-Release/libchipmunk.a"/>
 									<listOptionValue builtIn="false" value="&quot;${TARGET_LIB_PATH}/libc-newlib.so&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${TARGET_LIB_PATH}/libm-newlib.so&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${TARGET_LIB_PATH}/FOsp.so&quot;"/>
diff --git a/HelloWorld/bada/sdk2.0/lib/Target-Debug/.gitignore b/HelloWorld/bada/sdk2.0/lib/Target-Debug/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/HelloWorld/bada/sdk2.0/lib/Target-Release/.gitignore b/HelloWorld/bada/sdk2.0/lib/Target-Release/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/chipmunk/proj.bada/sdk2.0/.badaprj b/chipmunk/proj.bada/sdk2.0/.badaprj
index c84f00ca3b..3435da725a 100644
--- a/chipmunk/proj.bada/sdk2.0/.badaprj
+++ b/chipmunk/proj.bada/sdk2.0/.badaprj
@@ -2,7 +2,7 @@
 <bada>
     <type>0</type>
     <sdk>C:\bada\2.0.2</sdk>
-    <model>WaveWVGA</model>
+    <model>WaveHVGA</model>
     <apiversioncheck>true</apiversioncheck>
     <priviligecheck>false</priviligecheck>
     <properties/>
diff --git a/create-bada-project.bat b/create-bada-project.bat
index c4741fbbc4..005768964a 100644
--- a/create-bada-project.bat
+++ b/create-bada-project.bat
@@ -9,6 +9,16 @@ set COCOS2DX_ROOT=%cd%
 
 set /p PROJECT_NAME=please input project name:
 
+if /i %PROJECT_NAME%==tests (
+    echo can't not use "tests" as a project name, because it is used for cocos2dx tests project.
+    goto END
+)
+
+if /i %PROJECT_NAME%==HelloWorld (
+    echo can't not use "HelloWorld" as a project name, because it is used for cocos2dx HelloWorld project.
+    goto END
+)
+
 if not exist %PROJECT_NAME% md %PROJECT_NAME%
 
 cd %PROJECT_NAME%
@@ -26,8 +36,7 @@ if not exist bada (
     md bada\src
 ) else (
     echo "bada project exist!"
-    pause
-    exit
+    goto END
 )
 
 xcopy /y /s %COCOS2DX_ROOT%\HelloWorld\Resource\*.* Resource
@@ -52,7 +61,7 @@ if not exist Classes (
     md Classes
     xcopy /y /s %COCOS2DX_ROOT%\HelloWorld\Classes\*.* Classes
 ) else (
-    echo "Classes folder exist!"
+    echo "Classes folder exist, it will not be override!"
 )
 
 :: rename HelloWorldEntry.cpp
@@ -61,11 +70,16 @@ move bada\src\HelloWorldEntry.cpp bada\src\%PROJECT_NAME%Entry.cpp
 cd bada\sdk1.0
 call :replace .cproject
 call :replace .project
+call :replace application.xml
 
 cd ..\..\bada\sdk2.0
 call :replace .cproject
 call :replace .project
+call :replace application.xml
 
+echo Congratulations, %PROJECT_NAME% project have been created, please import the project from BadaIDE.
+
+:END
 endlocal
 pause
 exit
diff --git a/tests/test.bada/sdk2.0/.badaprj b/tests/test.bada/sdk2.0/.badaprj
index c84f00ca3b..3435da725a 100644
--- a/tests/test.bada/sdk2.0/.badaprj
+++ b/tests/test.bada/sdk2.0/.badaprj
@@ -2,7 +2,7 @@
 <bada>
     <type>0</type>
     <sdk>C:\bada\2.0.2</sdk>
-    <model>WaveWVGA</model>
+    <model>WaveHVGA</model>
     <apiversioncheck>true</apiversioncheck>
     <priviligecheck>false</priviligecheck>
     <properties/>