fixed cocos2d#300 Cocos2d-win32 application wizard for vs ok.

angeltown · Mar 10, 2011 · a0e616d · a0e616d
1 parent 1c6ee33
commit a0e616d
Show file tree

Hide file tree

Showing 9 changed files with 87 additions and 23 deletions.
diff --git a/HelloWorld/win32/HelloWorld.win32.vcproj b/HelloWorld/win32/HelloWorld.win32.vcproj
@@ -61,7 +61,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libcocos2d.lib libPlatformSupport.lib"
+				AdditionalDependencies="libcocos2d.lib"
 				OutputFile="$(OutDir)\$(ProjectName).exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(OutDir)"
@@ -119,7 +119,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)platform_support\include&quot;;&quot;$(SolutionDir)cocos2dx\include&quot;;&quot;$(SolutionDir)cocos2dx&quot;;&quot;$(SolutionDir)platform_support\third_party\win32\OGLES&quot;;..\;.\"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)cocos2dx\platform&quot;;&quot;$(SolutionDir)cocos2dx\include&quot;;&quot;$(SolutionDir)cocos2dx&quot;;&quot;$(SolutionDir)cocos2dx\platform\third_party\win32\OGLES&quot;;..\;.\"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -138,7 +138,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libcocos2d.lib libPlatformSupport.lib"
+				AdditionalDependencies="libcocos2d.lib"
 				OutputFile="$(OutDir)\$(ProjectName).exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"

diff --git a/build-win32.bat b/build-win32.bat
@@ -0,0 +1,67 @@
+@echo off
+
+echo./*
+echo.* Check VC++ environment...
+echo.*/
+echo.
+
+if defined VS90COMNTOOLS (
+    set VSVARS="%VS90COMNTOOLS%vsvars32.bat"
+) else (
+    if defined VS100COMNTOOLS (
+        set VSVARS="%VS100COMNTOOLS%vsvars32.bat"
+    )
+)
+
+if not defined VSVARS (
+    echo Can't find VC2008 or VC2010 installed!
+    goto ERROR
+)
+
+echo./*
+echo.* Building cocos2d-x library binary, please wait a while...
+echo.*/
+echo.
+
+call %VSVARS%
+vcbuild cocos2d-win32.sln $ALL
+
+echo./*
+echo.* Check the cocos2d-win32 application "tests.exe" ...
+echo.*/
+echo.
+
+set CC_TEST_PATH=".\Release.win32\tests.exe"
+if not exist %CC_TEST_PATH% (
+    echo Can't find the binary "tests.exe", is there build error?
+    goto ERROR
+)
+
+echo./*
+echo.* Install Cocos2d-win32 application wizard...
+echo.*/
+echo.
+
+set SCRIPT_LOG=InstallWizardLog.txt
+set SCRIPT_DIR=.\template\CCApplicationWizard.vs\
+
+if exist %SCRIPT_LOG% del /Q %SCRIPT_LOG%
+cscript "%SCRIPT_DIR%InstallWizardForVC2008Express.js" /quiet
+cscript "%SCRIPT_DIR%InstallWizardForVC2010Express.js" /quiet
+cscript "%SCRIPT_DIR%InstallWizardForVS2008.js" /quiet
+cscript "%SCRIPT_DIR%InstallWizardForVS2010.js" /quiet
+if exist %SCRIPT_LOG% more %SCRIPT_LOG%
+if exist %SCRIPT_LOG% del /Q %SCRIPT_LOG%
+
+echo./*
+echo.* Run cocos2d-win32 tests.exe and view Cocos2d-x Application Wizard for Visual Studio User Guide.
+echo.*/
+echo.
+call %CC_TEST_PATH%
+start http://www.cocos2d-x.org/projects/cocos2d-x/wiki/Cocos2d-x_Application_Wizard_for_Visual_Studio_User_Guide
+goto EOF
+
+:ERROR
+pause
+
+:EOF
diff --git a/cocos2dx/proj.win32/cocos2d-win32.vcproj b/cocos2dx/proj.win32/cocos2d-win32.vcproj
@@ -25,6 +25,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine=""
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -41,7 +42,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)\cocos2dx\platform&quot;;&quot;$(SolutionDir)cocos2dx\platform\third_party\win32\iconv&quot;;&quot;$(SolutionDir)cocos2dx\platform\third_party\win32\zlib&quot;;&quot;$(SolutionDir)cocos2dx\platform\third_party\win32\libpng&quot;;&quot;$(SolutionDir)cocos2dx\platform\third_party\win32\libjpeg&quot;;&quot;$(SolutionDir)cocos2dx\platform\third_party\win32\libxml2&quot;;&quot;$(SolutionDir)cocos2dx\platform\third_party\win32\OGLES&quot;;..\include;..\"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)\cocos2dx\platform&quot;;&quot;$(SolutionDir)cocos2dx\platform\third_party\win32\iconv&quot;;&quot;$(SolutionDir)cocos2dx\platform\third_party\win32\zlib&quot;;&quot;$(SolutionDir)cocos2dx\platform\third_party\win32\libpng&quot;;&quot;$(SolutionDir)cocos2dx\platform\third_party\win32\libjpeg&quot;;&quot;$(SolutionDir)cocos2dx\platform\third_party\win32\libxml2&quot;;&quot;$(SolutionDir)cocos2dx\platform\third_party\win32\OGLES&quot;;..\include;.."
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -60,6 +61,7 @@
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
+				CommandLine="if not exist $(OutDir) mkdir $(OutDir)&#x0D;&#x0A;xcopy /Y /Q $(SolutionDir)cocos2dx\platform\third_party\win32\libraries\*.* $(OutDir)"
 			/>
 			<Tool
 				Name="VCLinkerTool"
@@ -68,7 +70,7 @@
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;"
 				IgnoreAllDefaultLibraries="false"
-				IgnoreDefaultLibraryNames="MSVCRT.lib;LIBCMTD.lib"
+				IgnoreDefaultLibraryNames=" "
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				ImportLibrary="$(TargetDir)$(TargetName).lib"
@@ -106,6 +108,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine=""
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -121,7 +124,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)platform_support\include&quot;;&quot;$(SolutionDir)platform_support\third_party\win32\iconv&quot;;&quot;$(SolutionDir)platform_support\third_party\win32\zlib&quot;;&quot;$(SolutionDir)platform_support\third_party\win32\libpng&quot;;&quot;$(SolutionDir)platform_support\third_party\win32\libjpeg&quot;;&quot;$(SolutionDir)platform_support\third_party\win32\libxml2&quot;;&quot;$(SolutionDir)platform_support\third_party\win32\OGLES&quot;;..\include;..\"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)\cocos2dx\platform&quot;;&quot;$(SolutionDir)cocos2dx\platform\third_party\win32\iconv&quot;;&quot;$(SolutionDir)cocos2dx\platform\third_party\win32\zlib&quot;;&quot;$(SolutionDir)cocos2dx\platform\third_party\win32\libpng&quot;;&quot;$(SolutionDir)cocos2dx\platform\third_party\win32\libjpeg&quot;;&quot;$(SolutionDir)cocos2dx\platform\third_party\win32\libxml2&quot;;&quot;$(SolutionDir)cocos2dx\platform\third_party\win32\OGLES&quot;;..\include;.."
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -138,13 +141,15 @@
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
+				CommandLine="if not exist $(OutDir) mkdir $(OutDir)&#x0D;&#x0A;xcopy /Y /Q $(SolutionDir)cocos2dx\platform\third_party\win32\libraries\*.* $(OutDir)"
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libEGL.lib libgles_cm.lib libxml2.lib libzlib.lib libpng.lib libjpeg.lib libiconv.lib libPlatformSupport.lib"
+				AdditionalDependencies="libEGL.lib libgles_cm.lib libxml2.lib libzlib.lib libpng.lib libjpeg.lib libiconv.lib"
 				OutputFile="$(OutDir)\$(ProjectName).dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;"
+				IgnoreDefaultLibraryNames=" "
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"

diff --git a/template/CCApplicationWizard.vs/CCAppWiz.win32/Scripts/1033/default.js b/template/CCApplicationWizard.vs/CCAppWiz.win32/Scripts/1033/default.js
@@ -181,7 +181,7 @@ function AddConfigurations(proj, strProjectName) {
 
             // Additional Inlcude Directories
             var strAddIncludeDir = '.;.\\win32;.\\Classes';
-            strAddIncludeDir += ';..\\cocos2dx\\include';
+            strAddIncludeDir += ';..\\cocos2dx;..\\cocos2dx\\include';
             strAddIncludeDir += ';..\\cocos2dx\\platform';
             strAddIncludeDir += ';..\\cocos2dx\\platform\\third_party\\win32\\OGLES';
 

diff --git a/template/CCApplicationWizard.vs/InstallWizardForVC2008Express.js b/template/CCApplicationWizard.vs/InstallWizardForVC2008Express.js
@@ -226,7 +226,5 @@ function main() {
         return;
     }
 
-    if (! bQuiet) {
-        WScript.Echo("App Wizard successfully installed!");
-    }
+    EchoError(bQuiet, "App Wizard successfully installed for VC2008 Express!");
 }
diff --git a/template/CCApplicationWizard.vs/InstallWizardForVC2010Express.js b/template/CCApplicationWizard.vs/InstallWizardForVC2010Express.js
@@ -226,7 +226,5 @@ function main() {
         return;
     }
 
-    if (! bQuiet) {
-        WScript.Echo("App Wizard successfully installed!");
-    }
+    EchoError(bQuiet, "App Wizard successfully installed for VC2010 Express!");
 }
diff --git a/template/CCApplicationWizard.vs/InstallWizardForVS2008.js b/template/CCApplicationWizard.vs/InstallWizardForVS2008.js
@@ -223,7 +223,5 @@ function main() {
         return;
     }
 
-    if (! bQuiet) {
-        WScript.Echo("App Wizard successfully installed!");
-    }
+    EchoError(bQuiet, "App Wizard successfully installed for VS2008!");
 }
diff --git a/template/CCApplicationWizard.vs/InstallWizardForVS2010.js b/template/CCApplicationWizard.vs/InstallWizardForVS2010.js
@@ -223,7 +223,5 @@ function main() {
         return;
     }
 
-    if (! bQuiet) {
-        WScript.Echo("App Wizard successfully installed!");
-    }
+    EchoError(bQuiet, "App Wizard successfully installed for VS2010!");
 }
diff --git a/tests/test.win32/test.win32.vcproj b/tests/test.win32/test.win32.vcproj
@@ -62,7 +62,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libcocos2d.lib libPlatformSupport.lib libgles_cm.lib libBox2d.lib libchipmunk.lib"
+				AdditionalDependencies="libcocos2d.lib libgles_cm.lib libBox2d.lib libchipmunk.lib"
 				OutputFile="$(OutDir)\$(ProjectName).exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;"
@@ -120,7 +120,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)platform_support\include&quot;;&quot;$(SolutionDir)cocos2dx&quot;;&quot;$(SolutionDir)cocos2dx\include&quot;;&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)chipmunk\include\chipmunk&quot;;&quot;$(SolutionDir)CocosDenshion\include&quot;;..\tests;&quot;$(SolutionDir)platform_support\third_party\win32\OGLES&quot;;..\;.\"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)cocos2dx\platform&quot;;&quot;$(SolutionDir)cocos2dx&quot;;&quot;$(SolutionDir)cocos2dx\include&quot;;&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)chipmunk\include\chipmunk&quot;;&quot;$(SolutionDir)CocosDenshion\include&quot;;..\tests;&quot;$(SolutionDir)cocos2dx\platform\third_party\win32\OGLES&quot;;..\;.\"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USE_MATH_DEFINES;GL_GLEXT_PROTOTYPES"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -140,7 +140,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libcocos2d.lib libPlatformSupport.lib libgles_cm.lib libBox2d.lib libchipmunk.lib"
+				AdditionalDependencies="libcocos2d.lib libgles_cm.lib libBox2d.lib libchipmunk.lib"
 				OutputFile="$(OutDir)\$(ProjectName).exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;"