Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1529 from dumganhar/gles20 

Updated the project configuration of TestJavascript for win32 and android port.
This commit is contained in:
James Chen 2012-11-01 00:23:04 -07:00
parent de7026bab2 d9fd274f16
commit 9606592075
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
samples/TestJavascript/proj.android/.project
View File

@ -30,11 +30,4 @@
<nature>com.android.ide.eclipse.adt.AndroidNature</nature> <nature>com.android.ide.eclipse.adt.AndroidNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.jdt.core.javanature</nature>
</natures> </natures>
<linkedResources>
<link>
<name>src_common</name>
<type>2</type>
<locationURI>PARENT-3-PROJECT_LOC/cocos2dx/platform/android/java/src_common</locationURI>
</link>
</linkedResources>
</projectDescription> </projectDescription>

2
samples/TestJavascript/proj.win32/TestJavascript.vcproj
View File

@ -114,6 +114,8 @@
> >
<Tool <Tool
Name="VCPreBuildEventTool" Name="VCPreBuildEventTool"
Description="Copy js and resource files."
CommandLine="if not exist &quot;$(OutDir)&quot; mkdir &quot;$(OutDir)&quot;&#x0D;&#x0A;if exist &quot;$(OutDir)\TestJavascriptRes&quot; rd /s /q &quot;$(OutDir)\TestJavascriptRes&quot;&#x0D;&#x0A;mkdir &quot;$(OutDir)\TestJavascriptRes&quot;&#x0D;&#x0A;xcopy &quot;$(ProjectDir)..\cocos2d-html5-tests\res&quot; &quot;$(OutDir)\TestJavascriptRes\res\&quot; /e /Y&#x0D;&#x0A;xcopy &quot;$(ProjectDir)..\bindings\*.js&quot; &quot;$(OutDir)\TestJavascriptRes&quot; /e /Y&#x0D;&#x0A;dir &quot;$(ProjectDir)..\cocos2d-html5-tests\src\*.js&quot; /a /b /s &gt; filelist.txt&#x0D;&#x0A;for /f %%I in (filelist.txt) do (copy /Y %%I &quot;$(OutDir)\TestJavascriptRes&quot;)&#x0D;&#x0A;if exist filelist.txt del /f /q filelist.txt"
/> />
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"

12
samples/TestJavascript/proj.win32/TestJavascript.vcxproj
View File

@ -148,6 +148,18 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\scripting\javascript\spidermonkey-win32\lib\*
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine> <TargetMachine>MachineX86</TargetMachine>
</Link> </Link>
<PreBuildEvent>
<Command>if not exist "$(OutDir)" mkdir "$(OutDir)"
if exist "$(OutDir)\TestJavascriptRes" rd /s /q "$(OutDir)\TestJavascriptRes"
mkdir "$(OutDir)\TestJavascriptRes"
xcopy "$(ProjectDir)..\cocos2d-html5-tests\res" "$(OutDir)\TestJavascriptRes\res\" /e /Y
xcopy "$(ProjectDir)..\bindings\*.js" "$(OutDir)\TestJavascriptRes" /e /Y
dir "$(ProjectDir)..\cocos2d-html5-tests\src\*.js" /a /b /s &gt; filelist.txt
for /f %%I in (filelist.txt) do (copy /Y %%I "$(OutDir)\TestJavascriptRes")
if exist filelist.txt del /f /q filelist.txt
</Command>
<Message>Copy js and resource files.</Message>
</PreBuildEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\..\scripting\javascript\bindings\CCPhysicsSprite.cpp" /> <ClCompile Include="..\..\..\scripting\javascript\bindings\CCPhysicsSprite.cpp" />