Merge pull request #1710 from dumganhar/gles20

Updated build-win32.bat and win32 template.
This commit is contained in:
James Chen 2012-12-03 22:10:13 -08:00
commit b521327572
3 changed files with 23 additions and 10 deletions

View File

@ -45,15 +45,17 @@ cd ".\Release.win32\"
set CC_TEST_BIN=TestCpp.exe
set CC_TEST_RES=..\samples\TestCpp\Resources\*.*
set CC_HELLOWORLD_RES=..\samples\HelloCpp\Resources\*.*
set CC_HELLOLUA_RES=..\samples\HelloLua\Resources\*.*
set CC_TESTJS_RES=..\samples\TestJavascript\Resources\*.*
set CC_TEST_RES=..\samples\TestCpp\Resources
set CC_HELLOWORLD_RES=..\samples\HelloCpp\Resources
set CC_TESTLUA_RES=..\samples\TestLua\Resources
set CC_SIMPLEGAME_RES=..\samples\SimpleGame\Resources
set CC_HELLOLUA_RES=..\samples\HelloLua\Resources
set CC_JSB_SOURCES=..\scripting\javascript\bindings\js
set CC_TESTJS_RES=..\samples\TestJavascript\cocos2d-js-tests\tests
set CC_DRAGONJS_RES=..\samples\TestJavascript\cocos2d-js-tests\games\CocosDragonJS\Published files iOS
set CC_MOONWARRIORS_RES=..\samples\TestJavascript\cocos2d-js-tests\games\MoonWarriors
set CC_WATERMELONWITHME_RES=..\samples\TestJavascript\cocos2d-js-tests\games\WatermelonWithMe
if not exist "%CC_TEST_BIN%" (
echo Can't find the binary "TestCpp.exe", is there build error?
goto ERROR
)
echo./*
echo.* Run cocos2d-win32 tests.exe and view Cocos2d-x Application Wizard for Visual Studio User Guide.
@ -62,7 +64,18 @@ echo.
xcopy /E /Y /Q "%CC_TEST_RES%" .
xcopy /E /Y /Q "%CC_HELLOWORLD_RES%" .
xcopy /E /Y /Q "%CC_HELLOLUA_RES%" .
xcopy /E /Y /Q "%CC_TESTLUA_RES%" .
xcopy /E /Y /Q "%CC_SIMPLEGAME_RES%" .
xcopy /E /Y /Q "%CC_JSB_SOURCES%" .
xcopy /E /Y /Q "%CC_TESTJS_RES%" .
xcopy /E /Y /Q "%CC_MOONWARRIORS_RES%" .
xcopy /E /Y /Q "%CC_WATERMELONWITHME_RES%" .
xcopy /E /Y /Q "%CC_DRAGONJS_RES%" .
if not exist "%CC_TEST_BIN%" (
echo Can't find the binary "TestCpp.exe", is there build error?
goto ERROR
)
call "%CC_TEST_BIN%"
start http://www.cocos2d-x.org/projects/cocos2d-x/wiki/Cocos2d-x_Application_Wizard_for_Visual_Studio_User_Guide

View File

@ -33,7 +33,7 @@ function main() {
// Decode command line arguments
var bDebug = false;
var bQuiet = false;
var bElevated = false;
var bElevated = true;
var Args = WScript.Arguments;
for (var i = 0; i < Args.length; i++) {
if (Args(i) == "/debug")

View File

@ -33,7 +33,7 @@ function main() {
// Decode command line arguments
var bDebug = false;
var bQuiet = false;
var bElevated = false;
var bElevated = true;
var Args = WScript.Arguments;
for (var i = 0; i < Args.length; i++) {
if (Args(i) == "/debug")