Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes to make windows build work again #1216

Merged
merged 2 commits into from
Jul 23, 2019
Merged

Fixes to make windows build work again #1216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5829ebe
Fixes to make windows build compile again
saurabh-shukul-gojek Jul 18, 2019
d223a2f
updated readme to reflect vs2019 upgrade
saurabh-shukul-gojek Jul 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ Thumbs.db
/vs2010/ipch
/vs2010/bin
/vs2008/bin
/vs2015/bin
/vs2019/bin

/ide/bin
/ide/obj
Expand Down Expand Up @@ -54,3 +56,7 @@ android-studio/libmoai/.externalNativeBuild/
cmake/cmake/hosts/host-win-sdl/.vs/
cmake/lib/
cmake/env-local.bat
/**/Win32/Debug/
/**/windows/Debug/
/**/Win32/Release/
/**/windows/Release/
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ At the Moai SDK project level, pito does very little beyond generating the HTML
* __samples__ - Moai SDK desktop and mobile samples.
* __src__ - All Moai SDK source code for Moai libraries and hosts.
* __test__ - This is a legacy, Lua-based test runner. Will be replaced by Google Test.
* __vs2015__ - Visual Studio reference build system and reference project.
* __vs2019__ - Visual Studio reference build system and reference project.
* __xcode__ - Xcode build system and reference projects.

Be sure to check for README files in these folders.
Expand Down
2 changes: 1 addition & 1 deletion src/moai-core/MOAILuaRuntime.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -826,7 +826,7 @@ bool MOAILuaRuntime::IsLuaIdentifier ( const char *str ) {
//----------------------------------------------------------------//
bool MOAILuaRuntime::IsOpen () {

return ( this->mState != 0 );
return ( this->mState != (lua_State*) 0 );
}

//----------------------------------------------------------------//
Expand Down
4 changes: 2 additions & 2 deletions src/moai-sdl/host.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <moai-sdl/headers.h>

//================================================================//
// aku-box2d
// aku-sdl
//================================================================//

//----------------------------------------------------------------//
Expand All @@ -26,4 +26,4 @@ void AKUSdlContextInitialize () {
void AKUSdlSetWindow ( SDL_Window* window ) {

MOAIDialogSDL::Get ().SetWindow ( window ); // TODO: this is hacky; move to MOAIAppSDL or something
}
}
2 changes: 1 addition & 1 deletion src/moai-sim/MOAIFrameBuffer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ int MOAIFrameBuffer::_grabNextFrame ( lua_State* L ) {
self->mFrameImage.Set ( *self, image );
}

self->mGrabNextFrame = self->mFrameImage != 0;
self->mGrabNextFrame = (bool) self->mFrameImage != (int) 0;

if ( self->mGrabNextFrame ) {
self->mOnFrameFinish.SetRef ( *self, state, 3 );
Expand Down
4 changes: 2 additions & 2 deletions src/moai-sim/MOAIGfxStateGPUCache.cpp
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,7 @@ void MOAIGfxStateGPUCache::FlushScissorRect ( bool scissorEnabled, ZLRect rect )

active.mScissorRect = rect;

ZLRect rect = active.mFrameBuffer->WndRectToDevice ( rect );
active.mFrameBuffer->WndRectToDevice ( rect );

s32 x = ( s32 )active.mScissorRect.mXMin;
s32 y = ( s32 )active.mScissorRect.mYMin;
Expand Down Expand Up @@ -720,7 +720,7 @@ void MOAIGfxStateGPUCache::FlushViewRect ( ZLRect rect ) {

active.mViewRect = rect;

ZLRect rect = this->mActiveState.mFrameBuffer->WndRectToDevice ( rect );
this->mActiveState.mFrameBuffer->WndRectToDevice ( rect );

s32 x = ( s32 )active.mViewRect.mXMin;
s32 y = ( s32 )active.mViewRect.mYMin;
Expand Down
2 changes: 1 addition & 1 deletion src/zl-gfx/ZLGfxDevice.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ void ZLGfxDevice::Initialize () {

// if framebuffer object is not in code, check to see if it's available as
// an extension and remap to core function pointers if so
if (( isOpenGLES == false ) && ( majorVersion < 3 )) {
if (( isOpenGLES == false ) && ( sMajorVersion < 3 )) {

if ( glewIsSupported ( "GL_EXT_framebuffer_object" )) {

Expand Down
1 change: 1 addition & 0 deletions src/zl-gfx/ZLGfxHandle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Copyright (c) 2010-2017 Zipline Games, Inc. All Rights Reserved.
// http://getmoai.com

#include "pch.h"
#include <zl-gfx/ZLGfxHandle.h>

//================================================================//
Expand Down
484 changes: 0 additions & 484 deletions vs2015/sdl/sdl.vcxproj
View file
Open in desktop

This file was deleted.

468 changes: 0 additions & 468 deletions vs2015/sdl/sdl.vcxproj.filters
View file
Open in desktop

This file was deleted.

0 vs2015/.gitignore → vs2019/.gitignore
View file
Open in desktop
File renamed without changes.
1,384 changes: 692 additions & 692 deletions vs2015/assimp/assimp.vcxproj → vs2019/assimp/assimp.vcxproj
View file
Open in desktop

Large diffs are not rendered by default.

0 vs2015/assimp/assimp.vcxproj.filters → vs2019/assimp/assimp.vcxproj.filters
View file
Open in desktop
File renamed without changes.
578 changes: 289 additions & 289 deletions vs2015/box2d/box2d.vcxproj → vs2019/box2d/box2d.vcxproj
View file
Open in desktop

Large diffs are not rendered by default.

0 vs2015/box2d/box2d.vcxproj.filters → vs2019/box2d/box2d.vcxproj.filters
View file
Open in desktop
File renamed without changes.
0 vs2015/build-windows.bat → vs2019/build-windows.bat
View file
Open in desktop
File renamed without changes.
0 vs2015/buildvm/buildvm-post.bat → vs2019/buildvm/buildvm-post.bat
View file
Open in desktop
File renamed without changes.
509 changes: 255 additions & 254 deletions vs2015/buildvm/buildvm.vcxproj → vs2019/buildvm/buildvm.vcxproj
View file
Open in desktop

Large diffs are not rendered by default.

408 changes: 204 additions & 204 deletions vs2015/contrib/contrib.vcxproj → vs2019/contrib/contrib.vcxproj
View file
Open in desktop

Large diffs are not rendered by default.

442 changes: 222 additions & 220 deletions vs2015/expat/expat.vcxproj → vs2019/expat/expat.vcxproj
View file
Open in desktop

Large diffs are not rendered by default.

1,004 changes: 398 additions & 606 deletions vs2015/freetype/freetype.vcxproj → vs2019/freetype/freetype.vcxproj
View file
Open in desktop

Large diffs are not rendered by default.

302 changes: 151 additions & 151 deletions vs2015/freetype/freetype.vcxproj.filters → vs2019/freetype/freetype.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,152 +1,152 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{fd200dda-5e6d-4796-bfae-793a5fa9bfd3}</UniqueIdentifier>
<Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
</Filter>
<Filter Include="Source Files\FT_MODULES">
<UniqueIdentifier>{ad522192-7de5-43c2-8fb9-2ac33fbf679b}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{fbefacd3-8e15-4848-9b4b-5066a036ab65}</UniqueIdentifier>
<Extensions>h;hpp;hxx;hm;inl</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\autofit\autofit.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\bdf\bdf.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\cff\cff.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\base\ftbase.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\base\ftbitmap.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\cache\ftcache.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\base\ftfstype.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\base\ftgasp.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\base\ftglyph.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\gzip\ftgzip.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\base\ftinit.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\lzw\ftlzw.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\base\ftstroke.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\base\ftsystem.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\smooth\smooth.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\base\ftbbox.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\base\ftgxval.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\base\ftlcdfil.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\base\ftmm.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\base\ftotval.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\base\ftpatent.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\base\ftpfr.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\base\ftsynth.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\base\fttype1.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\base\ftwinfnt.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\pcf\pcf.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\pfr\pfr.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\psaux\psaux.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\pshinter\pshinter.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\psnames\psmodule.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\raster\raster.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\sfnt\sfnt.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\truetype\truetype.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\type1\type1.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\cid\type1cid.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\type42\type42.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\winfonts\winfnt.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\builds\windows\ftdebug.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\3rdparty\freetype-2.7\include\ft2build.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\3rdparty\freetype-2.7\include\freetype\config\ftconfig.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\3rdparty\freetype-2.7\include\freetype\config\ftheader.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\3rdparty\freetype-2.7\include\freetype\config\ftmodule.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\3rdparty\freetype-2.7\include\freetype\config\ftoption.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\3rdparty\freetype-2.7\include\freetype\config\ftstdlib.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{fd200dda-5e6d-4796-bfae-793a5fa9bfd3}</UniqueIdentifier>
<Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
</Filter>
<Filter Include="Source Files\FT_MODULES">
<UniqueIdentifier>{ad522192-7de5-43c2-8fb9-2ac33fbf679b}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{fbefacd3-8e15-4848-9b4b-5066a036ab65}</UniqueIdentifier>
<Extensions>h;hpp;hxx;hm;inl</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\autofit\autofit.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\bdf\bdf.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\cff\cff.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\base\ftbase.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\base\ftbitmap.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\cache\ftcache.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\base\ftfstype.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\base\ftgasp.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\base\ftglyph.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\gzip\ftgzip.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\base\ftinit.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\lzw\ftlzw.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\base\ftstroke.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\base\ftsystem.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\builds\windows\ftdebug.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\smooth\smooth.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\base\ftbbox.c">
<Filter>Source Files\FT_MODULES</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\base\ftgxval.c">
<Filter>Source Files\FT_MODULES</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\base\ftlcdfil.c">
<Filter>Source Files\FT_MODULES</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\base\ftmm.c">
<Filter>Source Files\FT_MODULES</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\base\ftotval.c">
<Filter>Source Files\FT_MODULES</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\base\ftpatent.c">
<Filter>Source Files\FT_MODULES</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\base\ftpfr.c">
<Filter>Source Files\FT_MODULES</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\base\ftsynth.c">
<Filter>Source Files\FT_MODULES</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\base\fttype1.c">
<Filter>Source Files\FT_MODULES</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\base\ftwinfnt.c">
<Filter>Source Files\FT_MODULES</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\pcf\pcf.c">
<Filter>Source Files\FT_MODULES</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\pfr\pfr.c">
<Filter>Source Files\FT_MODULES</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\psaux\psaux.c">
<Filter>Source Files\FT_MODULES</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\pshinter\pshinter.c">
<Filter>Source Files\FT_MODULES</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\psnames\psmodule.c">
<Filter>Source Files\FT_MODULES</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\raster\raster.c">
<Filter>Source Files\FT_MODULES</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\sfnt\sfnt.c">
<Filter>Source Files\FT_MODULES</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\truetype\truetype.c">
<Filter>Source Files\FT_MODULES</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\type1\type1.c">
<Filter>Source Files\FT_MODULES</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\cid\type1cid.c">
<Filter>Source Files\FT_MODULES</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\type42\type42.c">
<Filter>Source Files\FT_MODULES</Filter>
</ClCompile>
<ClCompile Include="..\..\3rdparty\freetype-2.7\src\winfonts\winfnt.c">
<Filter>Source Files\FT_MODULES</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\3rdparty\freetype-2.7\include\ft2build.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\3rdparty\freetype-2.7\include\freetype\config\ftconfig.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\3rdparty\freetype-2.7\include\freetype\config\ftheader.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\3rdparty\freetype-2.7\include\freetype\config\ftmodule.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\3rdparty\freetype-2.7\include\freetype\config\ftoption.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\3rdparty\freetype-2.7\include\freetype\config\ftstdlib.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>
Loading