Allow 64 bit windows builds (#301)

This commit is contained in:
Jarrett 2018-10-15 18:02:51 -04:00 committed by Jakob Botsch Nielsen
parent 9f9efe943e
commit 56dbf4c482
7 changed files with 2198 additions and 1067 deletions

View File

@ -308,7 +308,7 @@ public:
m_impl.pop_back();
return v;
}
int size() const { return m_impl.size(); }
int size() const { return static_cast<int>(m_impl.size()); }
int& operator[](int index) { return m_impl[index]; }
int operator[](int index) const { return m_impl[index]; }
};

View File

@ -40,7 +40,7 @@ protected:
int m_cacheCompressedSize;
int m_cacheRawSize;
int m_cacheLayerCount;
int m_cacheBuildMemUsage;
unsigned int m_cacheBuildMemUsage;
enum DrawMode
{

View File

@ -1339,7 +1339,7 @@ bool Sample_TempObstacles::handleBuild()
m_ctx->stopTimer(RC_TIMER_TOTAL);
m_cacheBuildTimeMs = m_ctx->getAccumulatedTime(RC_TIMER_TOTAL)/1000.0f;
m_cacheBuildMemUsage = m_talloc->high;
m_cacheBuildMemUsage = static_cast<unsigned int>(m_talloc->high);
const dtNavMesh* nav = m_navMesh;

View File

@ -33,7 +33,7 @@ static char g_textPool[TEXT_POOL_SIZE];
static unsigned g_textPoolSize = 0;
static const char* allocText(const char* text)
{
unsigned len = strlen(text)+1;
unsigned len = static_cast<unsigned>(strlen(text)+1);
if (g_textPoolSize + len >= TEXT_POOL_SIZE)
return 0;
char* dst = &g_textPool[g_textPoolSize];

View File

@ -36,6 +36,7 @@ solution "recastnavigation"
-- windows specific
configuration "windows"
platforms { "Win32", "Win64" }
defines { "WIN32", "_WINDOWS", "_CRT_SECURE_NO_WARNINGS", "_HAS_EXCEPTIONS=0" }
-- warnings "Extra" uses /W4 which is too aggressive for us, so use W3 instead.
-- Disable:
@ -43,6 +44,12 @@ solution "recastnavigation"
-- * C4291: no matching operator delete found; we don't use exceptions, so doesn't matter
buildoptions { "/W3", "/wd4351", "/wd4291" }
filter "platforms:Win32"
architecture "x32"
filter "platforms:Win64"
architecture "x64"
project "DebugUtils"
language "C++"
kind "StaticLib"
@ -153,7 +160,7 @@ project "RecastDemo"
-- windows library cflags and libs
configuration { "windows" }
includedirs { "../RecastDemo/Contrib/SDL/include" }
libdirs { "../RecastDemo/Contrib/SDL/lib/x86" }
libdirs { "../RecastDemo/Contrib/SDL/lib/%{cfg.architecture:gsub('x86_64', 'x64')}" }
debugdir "../RecastDemo/Bin/"
links {
"glu32",
@ -163,7 +170,7 @@ project "RecastDemo"
}
postbuildcommands {
-- Copy the SDL2 dll to the Bin folder.
'{COPY} "%{wks.location}../../Contrib/SDL/lib/x86/SDL2.dll" "%{cfg.targetdir}"'
'{COPY} "%{wks.location}../../Contrib/SDL/lib/%{cfg.architecture:gsub("x86_64", "x64")}/SDL2.dll" "%{cfg.targetdir}"'
}
-- mac includes and libs
@ -233,7 +240,7 @@ project "Tests"
-- windows library cflags and libs
configuration { "windows" }
includedirs { "../RecastDemo/Contrib/SDL/include" }
libdirs { "../RecastDemo/Contrib/SDL/lib/x86" }
libdirs { "../RecastDemo/Contrib/SDL/lib/%{cfg.architecture:gsub('x86_64', 'x64')}" }
debugdir "../RecastDemo/Bin/"
links {
"glu32",

File diff suppressed because it is too large Load Diff

View File

@ -16,6 +16,9 @@ configuration:
- Debug
- Release
platform:
- Win64
install:
# Download Premake
- ps: Start-FileDownload 'https://github.com/premake/premake-core/releases/download/v5.0.0-alpha12/premake-5.0.0-alpha12-windows.zip' 'premake.zip'