mirror of https://github.com/axmolengine/axmol.git
issue #1454: Updated win32 project configuration and some .plist files.
Removed old binding files.
This commit is contained in:
James Chen
parent
e7e954045a
commit
0d2c2b3bf8
|
|
@ -18,6 +18,9 @@ EndProject
|
|||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestCpp", "samples\TestCpp\proj.win32\TestCpp.vcxproj", "{76A39BB2-9B84-4C65-98A5-654D86B86F2A}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestJavascript", "samples\TestJavascript\proj.win32\TestJavascript.vcxproj", "{D0F06A44-A245-4D13-A498-0120C203B539}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{207BC7A9-CCF1-4F2F-A04D-45F72242AE25} = {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libExtensions", "extensions\proj.win32\libExtensions.vcxproj", "{21B2C324-891F-48EA-AD1A-5AE13DE12E28}"
|
||||
EndProject
|
||||
|
|
@ -32,6 +35,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestLua", "samples\TestLua\
|
|||
EndProjectSection
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(DPCodeReviewSolutionGUID) = preSolution
|
||||
DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Win32 = Debug|Win32
|
||||
Release|Win32 = Release|Win32
|
||||
|
|
@ -85,7 +91,4 @@ Global
|
|||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
GlobalSection(DPCodeReviewSolutionGUID) = preSolution
|
||||
DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
|
|
|
|||
|
|
@ -136,7 +136,7 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalIncludeDirectories=".;..\Classes;"$(SolutionDir)scripting\javascript\spidermonkey-win32\include";"$(SolutionDir)scripting\javascript\bindings";"$(SolutionDir)cocos2dx";"$(SolutionDir)cocos2dx\include";"$(SolutionDir)cocos2dx\kazmath\include";"$(SolutionDir)cocos2dx\platform\win32";"$(SolutionDir)cocos2dx\platform\third_party\win32";"$(SolutionDir)cocos2dx\platform\third_party\win32\OGLES";"$(SolutionDir)CocosDenshion\include""
|
||||
AdditionalIncludeDirectories=".;..\Classes;"$(SolutionDir)scripting\javascript\spidermonkey-win32\include";"$(SolutionDir)scripting\javascript\bindings";"$(SolutionDir)external\chipmunk\include\chipmunk";"$(SolutionDir)cocos2dx";"$(SolutionDir)cocos2dx\include";"$(SolutionDir)cocos2dx\kazmath\include";"$(SolutionDir)cocos2dx\platform\win32";"$(SolutionDir)cocos2dx\platform\third_party\win32";"$(SolutionDir)cocos2dx\platform\third_party\win32\OGLES";"$(SolutionDir)CocosDenshion\include""
|
||||
PreprocessorDefinitions="WIN32;_WINDOWS;STRICT;NDEBUG;COCOS2D_JAVASCRIPT;XP_WIN;JS_HAVE___INTN;JS_INTPTR_TYPE=int;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS"
|
||||
ExceptionHandling="0"
|
||||
RuntimeLibrary="2"
|
||||
|
|
@ -160,7 +160,7 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="libcocos2d.lib opengl32.lib glew32.lib libCocosDenshion.lib js.lib"
|
||||
AdditionalDependencies="libcocos2d.lib libCocosDenshion.lib libchipmunk.lib mozjs.lib"
|
||||
LinkIncremental="1"
|
||||
AdditionalLibraryDirectories="$(OutDir)"
|
||||
SubSystem="2"
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@
|
|||
</Midl>
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>.;..\Classes;$(SolutionDir)scripting\javascript\spidermonkey-win32\include;$(SolutionDir)scripting\javascript\bindings;$(SolutionDir)cocos2dx;$(SolutionDir)cocos2dx\include;$(SolutionDir)cocos2dx\kazmath\include;$(SolutionDir)cocos2dx\platform\win32;$(SolutionDir)cocos2dx\platform\third_party\win32;$(SolutionDir)cocos2dx\platform\third_party\win32\OGLES;$(SolutionDir)CocosDenshion\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>.;..\Classes;$(SolutionDir)scripting\javascript\spidermonkey-win32\include;$(SolutionDir)external\chipmunk\include\chipmunk;$(SolutionDir)scripting\javascript\bindings;$(SolutionDir)cocos2dx;$(SolutionDir)cocos2dx\include;$(SolutionDir)cocos2dx\kazmath\include;$(SolutionDir)cocos2dx\platform\win32;$(SolutionDir)cocos2dx\platform\third_party\win32;$(SolutionDir)cocos2dx\platform\third_party\win32\OGLES;$(SolutionDir)CocosDenshion\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;_WINDOWS;STRICT;_DEBUG;XP_WIN;JS_HAVE___INTN;JS_INTPTR_TYPE=int;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<MinimalRebuild>true</MinimalRebuild>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
|
|
@ -85,7 +85,7 @@ xcopy /Y /Q "$(SolutionDir)scripting\javascript\spidermonkey-win32\lib\*.*" "$(O
|
|||
</Command>
|
||||
</PreLinkEvent>
|
||||
<Link>
|
||||
<AdditionalDependencies>libcocos2d.lib;libCocosDenshion.lib;js.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalDependencies>libcocos2d.lib;opengl32.lib;glew32.lib;libCocosDenshion.lib;libchipmunk.lib;mozjs.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
|
|
@ -106,7 +106,7 @@ xcopy /Y /Q "$(SolutionDir)scripting\javascript\spidermonkey-win32\lib\*.*" "$(O
|
|||
<ProxyFileName>testjs_p.c</ProxyFileName>
|
||||
</Midl>
|
||||
<ClCompile>
|
||||
<AdditionalIncludeDirectories>.;..\Classes;$(SolutionDir)scripting\javascript\spidermonkey-win32\include;$(SolutionDir)scripting\javascript\bindings;$(SolutionDir)cocos2dx;$(SolutionDir)cocos2dx\include;$(SolutionDir)cocos2dx\kazmath\include;$(SolutionDir)cocos2dx\platform\win32;$(SolutionDir)cocos2dx\platform\third_party\win32;$(SolutionDir)cocos2dx\platform\third_party\win32\OGLES;$(SolutionDir)CocosDenshion\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>.;..\Classes;$(SolutionDir)scripting\javascript\spidermonkey-win32\include;$(SolutionDir)external\chipmunk\include\chipmunk;$(SolutionDir)scripting\javascript\bindings;$(SolutionDir)cocos2dx;$(SolutionDir)cocos2dx\include;$(SolutionDir)cocos2dx\kazmath\include;$(SolutionDir)cocos2dx\platform\win32;$(SolutionDir)cocos2dx\platform\third_party\win32;$(SolutionDir)cocos2dx\platform\third_party\win32\OGLES;$(SolutionDir)CocosDenshion\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;_WINDOWS;STRICT;NDEBUG;XP_WIN;JS_HAVE___INTN;JS_INTPTR_TYPE=int;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<ExceptionHandling>
|
||||
</ExceptionHandling>
|
||||
|
|
@ -129,32 +129,38 @@ xcopy /Y /Q "$(SolutionDir)scripting\javascript\spidermonkey-win32\lib\*.*" "$(O
|
|||
</Command>
|
||||
</PreLinkEvent>
|
||||
<Link>
|
||||
<AdditionalDependencies>libcocos2d.lib;opengl32.lib;glew32.lib;libCocosDenshion.lib;js.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalDependencies>libcocos2d.lib;opengl32.lib;glew32.lib;libCocosDenshion.lib;libchipmunk.lib;mozjs.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<TargetMachine>MachineX86</TargetMachine>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\..\..\scripting\javascript\bindings\cocos2d_generated.cpp" />
|
||||
<ClCompile Include="..\..\..\scripting\javascript\bindings\cocos2d_manual_bindings.cpp" />
|
||||
<ClCompile Include="..\..\..\scripting\javascript\bindings\cocos_denshion_generated.cpp" />
|
||||
<ClCompile Include="..\..\..\scripting\javascript\bindings\CCPhysicsSprite.cpp" />
|
||||
<ClCompile Include="..\..\..\scripting\javascript\bindings\cocos2dx.cpp" />
|
||||
<ClCompile Include="..\..\..\scripting\javascript\bindings\cocos2d_specifics.cpp" />
|
||||
<ClCompile Include="..\..\..\scripting\javascript\bindings\js_bindings_chipmunk_functions.cpp" />
|
||||
<ClCompile Include="..\..\..\scripting\javascript\bindings\js_bindings_chipmunk_manual.cpp" />
|
||||
<ClCompile Include="..\..\..\scripting\javascript\bindings\js_manual_conversions.cpp" />
|
||||
<ClCompile Include="..\..\..\scripting\javascript\bindings\ScriptingCore.cpp" />
|
||||
<ClCompile Include="main.cpp" />
|
||||
<ClCompile Include="..\Classes\AppDelegate.cpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\..\..\scripting\javascript\bindings\cocos2d_generated.hpp" />
|
||||
<ClInclude Include="..\..\..\scripting\javascript\bindings\cocos_denshion_generated.hpp" />
|
||||
<ClInclude Include="..\..\..\scripting\javascript\bindings\CCPhysicsSprite.h" />
|
||||
<ClInclude Include="..\..\..\scripting\javascript\bindings\cocos2dx.hpp" />
|
||||
<ClInclude Include="..\..\..\scripting\javascript\bindings\cocos2d_specifics.hpp" />
|
||||
<ClInclude Include="..\..\..\scripting\javascript\bindings\js_bindings_chipmunk_functions.hpp" />
|
||||
<ClInclude Include="..\..\..\scripting\javascript\bindings\js_bindings_chipmunk_manual.hpp" />
|
||||
<ClInclude Include="..\..\..\scripting\javascript\bindings\js_bindings_config.h" />
|
||||
<ClInclude Include="..\..\..\scripting\javascript\bindings\js_manual_conversions.h" />
|
||||
<ClInclude Include="..\..\..\scripting\javascript\bindings\ScriptingCore.h" />
|
||||
<ClInclude Include="..\..\..\scripting\javascript\bindings\spidermonkey_specifics.h" />
|
||||
<ClInclude Include="main.h" />
|
||||
<ClInclude Include="resource.h" />
|
||||
<ClInclude Include="..\Classes\AppDelegate.h" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="..\Resources\CloseNormal.png" />
|
||||
<None Include="..\Resources\CloseSelected.png" />
|
||||
<None Include="..\Resources\HelloWorld.png" />
|
||||
<None Include="res\testjs.ico" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -16,35 +16,35 @@
|
|||
</Filter>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\..\..\scripting\javascript\bindings\cocos2d_generated.cpp">
|
||||
<Filter>bindings</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\scripting\javascript\bindings\cocos2d_manual_bindings.cpp">
|
||||
<Filter>bindings</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\scripting\javascript\bindings\cocos_denshion_generated.cpp">
|
||||
<Filter>bindings</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\scripting\javascript\bindings\ScriptingCore.cpp">
|
||||
<Filter>bindings</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="main.cpp">
|
||||
<Filter>win32</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\Classes\AppDelegate.cpp">
|
||||
<Filter>Classes</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\scripting\javascript\bindings\CCPhysicsSprite.cpp">
|
||||
<Filter>bindings</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\scripting\javascript\bindings\cocos2d_specifics.cpp">
|
||||
<Filter>bindings</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\scripting\javascript\bindings\cocos2dx.cpp">
|
||||
<Filter>bindings</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\scripting\javascript\bindings\js_bindings_chipmunk_functions.cpp">
|
||||
<Filter>bindings</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\scripting\javascript\bindings\js_bindings_chipmunk_manual.cpp">
|
||||
<Filter>bindings</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\scripting\javascript\bindings\js_manual_conversions.cpp">
|
||||
<Filter>bindings</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\scripting\javascript\bindings\ScriptingCore.cpp">
|
||||
<Filter>bindings</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\..\..\scripting\javascript\bindings\cocos2d_generated.hpp">
|
||||
<Filter>bindings</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\scripting\javascript\bindings\cocos_denshion_generated.hpp">
|
||||
<Filter>bindings</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\scripting\javascript\bindings\ScriptingCore.h">
|
||||
<Filter>bindings</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="main.h">
|
||||
<Filter>win32</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -54,17 +54,35 @@
|
|||
<ClInclude Include="..\Classes\AppDelegate.h">
|
||||
<Filter>Classes</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\scripting\javascript\bindings\CCPhysicsSprite.h">
|
||||
<Filter>bindings</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\scripting\javascript\bindings\cocos2d_specifics.hpp">
|
||||
<Filter>bindings</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\scripting\javascript\bindings\cocos2dx.hpp">
|
||||
<Filter>bindings</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\scripting\javascript\bindings\js_bindings_chipmunk_functions.hpp">
|
||||
<Filter>bindings</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\scripting\javascript\bindings\js_bindings_chipmunk_manual.hpp">
|
||||
<Filter>bindings</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\scripting\javascript\bindings\js_bindings_config.h">
|
||||
<Filter>bindings</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\scripting\javascript\bindings\js_manual_conversions.h">
|
||||
<Filter>bindings</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\scripting\javascript\bindings\ScriptingCore.h">
|
||||
<Filter>bindings</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\scripting\javascript\bindings\spidermonkey_specifics.h">
|
||||
<Filter>bindings</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="..\Resources\CloseNormal.png">
|
||||
<Filter>resource</Filter>
|
||||
</None>
|
||||
<None Include="..\Resources\CloseSelected.png">
|
||||
<Filter>resource</Filter>
|
||||
</None>
|
||||
<None Include="..\Resources\HelloWorld.png">
|
||||
<Filter>resource</Filter>
|
||||
</None>
|
||||
<None Include="res\testjs.ico">
|
||||
<Filter>resource</Filter>
|
||||
</None>
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
d19a3f7a6e0414d685adcb4cd1e49dbc6eb62451
|
||||
Loading…
Reference in New Issue