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

fixed #1647: [WebSocket] Fixing compilation errors on win32.

This commit is contained in:
James Chen 2013-06-03 10:03:38 +08:00
parent f2f0f031c7
commit d0680258c6
4 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj
View File

@ -88,6 +88,11 @@
<Command> <Command>
</Command> </Command>
</PostBuildEvent> </PostBuildEvent>
<PreLinkEvent>
<Command>if not exist "$(OutDir)" mkdir "$(OutDir)"
xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\libwebsockets\win32\lib\*.*" "$(OutDir)"
</Command>
</PreLinkEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile> <ClCompile>
@ -117,6 +122,11 @@
<Command> <Command>
</Command> </Command>
</PostBuildEvent> </PostBuildEvent>
<PreLinkEvent>
<Command>if not exist "$(OutDir)" mkdir "$(OutDir)"
xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\libwebsockets\win32\lib\*.*" "$(OutDir)"
</Command>
</PreLinkEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\Classes\ChipmunkTest\ChipmunkTest.cpp" /> <ClCompile Include="..\Classes\ChipmunkTest\ChipmunkTest.cpp" />

6
samples/Javascript/TestJavascript/proj.win32/TestJavascript.vcxproj
View File

@ -94,10 +94,11 @@
<PreLinkEvent> <PreLinkEvent>
<Command>if not exist "$(OutDir)" mkdir "$(OutDir)" <Command>if not exist "$(OutDir)" mkdir "$(OutDir)"
xcopy /Y /Q "$(ProjectDir)..\..\..\..\scripting\javascript\spidermonkey-win32\lib\*.*" "$(OutDir)" xcopy /Y /Q "$(ProjectDir)..\..\..\..\scripting\javascript\spidermonkey-win32\lib\*.*" "$(OutDir)"
xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\libwebsockets\win32\lib\*.*" "$(OutDir)"
</Command> </Command>
</PreLinkEvent> </PreLinkEvent>
<Link> <Link>
<AdditionalDependencies>libcocos2d.lib;libExtensions.lib;opengl32.lib;glew32.lib;libCocosDenshion.lib;libchipmunk.lib;libJSBinding.lib;libcurl_imp.lib;mozjs.lib;ws2_32.lib;sqlite3.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>libcocos2d.lib;libExtensions.lib;opengl32.lib;glew32.lib;libCocosDenshion.lib;libchipmunk.lib;libJSBinding.lib;libcurl_imp.lib;mozjs.lib;ws2_32.lib;sqlite3.lib;pthreadVCE2.lib;websockets.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
@ -148,10 +149,11 @@ xcopy "$(ProjectDir)..\..\Shared\tests" "$(OutDir)\TestJavascriptRes\" /e /Y</Co
<PreLinkEvent> <PreLinkEvent>
<Command>if not exist "$(OutDir)" mkdir "$(OutDir)" <Command>if not exist "$(OutDir)" mkdir "$(OutDir)"
xcopy /Y /Q "$(ProjectDir)..\..\..\..\scripting\javascript\spidermonkey-win32\lib\*.*" "$(OutDir)" xcopy /Y /Q "$(ProjectDir)..\..\..\..\scripting\javascript\spidermonkey-win32\lib\*.*" "$(OutDir)"
xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\libwebsockets\win32\lib\*.*" "$(OutDir)"
</Command> </Command>
</PreLinkEvent> </PreLinkEvent>
<Link> <Link>
<AdditionalDependencies>libcocos2d.lib;libExtensions.lib;opengl32.lib;glew32.lib;libCocosDenshion.lib;libchipmunk.lib;libJSBinding.lib;libcurl_imp.lib;mozjs.lib;ws2_32.lib;sqlite3.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>libcocos2d.lib;libExtensions.lib;opengl32.lib;glew32.lib;libCocosDenshion.lib;libchipmunk.lib;libJSBinding.lib;libcurl_imp.lib;mozjs.lib;ws2_32.lib;sqlite3.lib;pthreadVCE2.lib;websockets.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine> <TargetMachine>MachineX86</TargetMachine>

2
scripting/javascript/bindings/proj.win32/libJSBinding.vcxproj
View File

@ -39,6 +39,7 @@
<ClInclude Include="..\generated\jsb_cocos2dx_auto.hpp" /> <ClInclude Include="..\generated\jsb_cocos2dx_auto.hpp" />
<ClInclude Include="..\generated\jsb_cocos2dx_extension_auto.hpp" /> <ClInclude Include="..\generated\jsb_cocos2dx_extension_auto.hpp" />
<ClInclude Include="..\jsb_cocos2dx_extension_manual.h" /> <ClInclude Include="..\jsb_cocos2dx_extension_manual.h" />
<ClInclude Include="..\jsb_helper.h" />
<ClInclude Include="..\jsb_opengl_functions.h" /> <ClInclude Include="..\jsb_opengl_functions.h" />
<ClInclude Include="..\jsb_opengl_manual.h" /> <ClInclude Include="..\jsb_opengl_manual.h" />
<ClInclude Include="..\jsb_opengl_registration.h" /> <ClInclude Include="..\jsb_opengl_registration.h" />
@ -59,7 +60,6 @@
<ClInclude Include="..\js_manual_conversions.h" /> <ClInclude Include="..\js_manual_conversions.h" />
<ClInclude Include="..\ScriptingCore.h" /> <ClInclude Include="..\ScriptingCore.h" />
<ClInclude Include="..\spidermonkey_specifics.h" /> <ClInclude Include="..\spidermonkey_specifics.h" />
<ClInclude Include="..\XMLHTTPHelper.h" />
<ClInclude Include="..\XMLHTTPRequest.h" /> <ClInclude Include="..\XMLHTTPRequest.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

4
scripting/javascript/bindings/proj.win32/libJSBinding.vcxproj.filters
View File

@ -154,10 +154,10 @@
<ClInclude Include="..\XMLHTTPRequest.h"> <ClInclude Include="..\XMLHTTPRequest.h">
<Filter>manual</Filter> <Filter>manual</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\XMLHTTPHelper.h"> <ClInclude Include="..\jsb_websocket.h">
<Filter>manual</Filter> <Filter>manual</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\jsb_websocket.h"> <ClInclude Include="..\jsb_helper.h">
<Filter>manual</Filter> <Filter>manual</Filter>
</ClInclude> </ClInclude>
</ItemGroup> </ItemGroup>