aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorClyne Sullivan <tullivan99@gmail.com>2017-09-26 22:37:52 -0400
committerClyne Sullivan <tullivan99@gmail.com>2017-09-26 22:37:52 -0400
commit8be1f74e878950cbbac3f05451341fc18892518b (patch)
tree8301f06ee0da2b27fb93b149736c6f7d2ace68ca /src
parent19b2b1dde25885ada99deefe79266c2e22376e85 (diff)
windows 64-bit build
Diffstat (limited to 'src')
-rw-r--r--src/fileio.cpp4
-rw-r--r--src/particle.cpp2
2 files changed, 5 insertions, 1 deletions
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 <dirent.h>
#include <errno.h>
+#else
+
+#include <windows.h>
+
#endif // __WIN32__
int getdir(std::string dir, std::list<std::string>& 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<void*>(reinterpret_cast<unsigned long long>(vbobuf) + offset), coords, entrySize);
}
UserAssert(glUnmapBuffer(GL_ARRAY_BUFFER) == GL_TRUE, "Failed to unmap the particle VBO");