From 8be1f74e878950cbbac3f05451341fc18892518b Mon Sep 17 00:00:00 2001 From: Clyne Sullivan Date: Tue, 26 Sep 2017 22:37:52 -0400 Subject: windows 64-bit build --- src/fileio.cpp | 4 ++++ src/particle.cpp | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/fileio.cpp b/src/fileio.cpp index 28e0c17..210207f 100644 --- a/src/fileio.cpp +++ b/src/fileio.cpp @@ -10,6 +10,10 @@ #include #include +#else + +#include + #endif // __WIN32__ int getdir(std::string dir, std::list& files) diff --git a/src/particle.cpp b/src/particle.cpp index f2604a6..3303027 100644 --- a/src/particle.cpp +++ b/src/particle.cpp @@ -72,7 +72,7 @@ void ParticleSystem::render(void) }; //glBufferSubData(GL_ARRAY_BUFFER, offset, entrySize, coords); - std::memcpy((void *)((unsigned long)vbobuf + offset), coords, entrySize); + std::memcpy(reinterpret_cast(reinterpret_cast(vbobuf) + offset), coords, entrySize); } UserAssert(glUnmapBuffer(GL_ARRAY_BUFFER) == GL_TRUE, "Failed to unmap the particle VBO"); -- cgit v1.2.3