Allow 64 bit windows builds (#301)
This commit is contained in:
parent
9f9efe943e
commit
56dbf4c482
@ -308,7 +308,7 @@ public:
|
|||||||
m_impl.pop_back();
|
m_impl.pop_back();
|
||||||
return v;
|
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) { return m_impl[index]; }
|
||||||
int operator[](int index) const { return m_impl[index]; }
|
int operator[](int index) const { return m_impl[index]; }
|
||||||
};
|
};
|
||||||
|
@ -40,7 +40,7 @@ protected:
|
|||||||
int m_cacheCompressedSize;
|
int m_cacheCompressedSize;
|
||||||
int m_cacheRawSize;
|
int m_cacheRawSize;
|
||||||
int m_cacheLayerCount;
|
int m_cacheLayerCount;
|
||||||
int m_cacheBuildMemUsage;
|
unsigned int m_cacheBuildMemUsage;
|
||||||
|
|
||||||
enum DrawMode
|
enum DrawMode
|
||||||
{
|
{
|
||||||
|
@ -1339,7 +1339,7 @@ bool Sample_TempObstacles::handleBuild()
|
|||||||
m_ctx->stopTimer(RC_TIMER_TOTAL);
|
m_ctx->stopTimer(RC_TIMER_TOTAL);
|
||||||
|
|
||||||
m_cacheBuildTimeMs = m_ctx->getAccumulatedTime(RC_TIMER_TOTAL)/1000.0f;
|
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;
|
const dtNavMesh* nav = m_navMesh;
|
||||||
|
@ -33,7 +33,7 @@ static char g_textPool[TEXT_POOL_SIZE];
|
|||||||
static unsigned g_textPoolSize = 0;
|
static unsigned g_textPoolSize = 0;
|
||||||
static const char* allocText(const char* text)
|
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)
|
if (g_textPoolSize + len >= TEXT_POOL_SIZE)
|
||||||
return 0;
|
return 0;
|
||||||
char* dst = &g_textPool[g_textPoolSize];
|
char* dst = &g_textPool[g_textPoolSize];
|
||||||
|
@ -36,6 +36,7 @@ solution "recastnavigation"
|
|||||||
|
|
||||||
-- windows specific
|
-- windows specific
|
||||||
configuration "windows"
|
configuration "windows"
|
||||||
|
platforms { "Win32", "Win64" }
|
||||||
defines { "WIN32", "_WINDOWS", "_CRT_SECURE_NO_WARNINGS", "_HAS_EXCEPTIONS=0" }
|
defines { "WIN32", "_WINDOWS", "_CRT_SECURE_NO_WARNINGS", "_HAS_EXCEPTIONS=0" }
|
||||||
-- warnings "Extra" uses /W4 which is too aggressive for us, so use W3 instead.
|
-- warnings "Extra" uses /W4 which is too aggressive for us, so use W3 instead.
|
||||||
-- Disable:
|
-- Disable:
|
||||||
@ -43,6 +44,12 @@ solution "recastnavigation"
|
|||||||
-- * C4291: no matching operator delete found; we don't use exceptions, so doesn't matter
|
-- * C4291: no matching operator delete found; we don't use exceptions, so doesn't matter
|
||||||
buildoptions { "/W3", "/wd4351", "/wd4291" }
|
buildoptions { "/W3", "/wd4351", "/wd4291" }
|
||||||
|
|
||||||
|
filter "platforms:Win32"
|
||||||
|
architecture "x32"
|
||||||
|
|
||||||
|
filter "platforms:Win64"
|
||||||
|
architecture "x64"
|
||||||
|
|
||||||
project "DebugUtils"
|
project "DebugUtils"
|
||||||
language "C++"
|
language "C++"
|
||||||
kind "StaticLib"
|
kind "StaticLib"
|
||||||
@ -153,7 +160,7 @@ project "RecastDemo"
|
|||||||
-- windows library cflags and libs
|
-- windows library cflags and libs
|
||||||
configuration { "windows" }
|
configuration { "windows" }
|
||||||
includedirs { "../RecastDemo/Contrib/SDL/include" }
|
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/"
|
debugdir "../RecastDemo/Bin/"
|
||||||
links {
|
links {
|
||||||
"glu32",
|
"glu32",
|
||||||
@ -163,7 +170,7 @@ project "RecastDemo"
|
|||||||
}
|
}
|
||||||
postbuildcommands {
|
postbuildcommands {
|
||||||
-- Copy the SDL2 dll to the Bin folder.
|
-- 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
|
-- mac includes and libs
|
||||||
@ -233,7 +240,7 @@ project "Tests"
|
|||||||
-- windows library cflags and libs
|
-- windows library cflags and libs
|
||||||
configuration { "windows" }
|
configuration { "windows" }
|
||||||
includedirs { "../RecastDemo/Contrib/SDL/include" }
|
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/"
|
debugdir "../RecastDemo/Bin/"
|
||||||
links {
|
links {
|
||||||
"glu32",
|
"glu32",
|
||||||
|
3241
Tests/catch.hpp
3241
Tests/catch.hpp
File diff suppressed because it is too large
Load Diff
@ -16,6 +16,9 @@ configuration:
|
|||||||
- Debug
|
- Debug
|
||||||
- Release
|
- Release
|
||||||
|
|
||||||
|
platform:
|
||||||
|
- Win64
|
||||||
|
|
||||||
install:
|
install:
|
||||||
# Download Premake
|
# 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'
|
- ps: Start-FileDownload 'https://github.com/premake/premake-core/releases/download/v5.0.0-alpha12/premake-5.0.0-alpha12-windows.zip' 'premake.zip'
|
||||||
|
Loading…
x
Reference in New Issue
Block a user