Merge pull request #703 from seanpaultaylor/next

Updated gameplay-encoder and gameplay-luagen binaries for windows.

gameplay-encoder/src/Base.h

@@ -20,6 +20,11 @@
 #include <algorithm>
 #include <sys/stat.h>
 
+using std::memcpy;
+using std::size_t;
+using std::min;
+using std::max;
+
 // PNG
 #include <png.h>
 

gameplay-encoder/src/Heightmap.cpp

@@ -1,3 +1,4 @@
+#include "Base.h"
 #include "Heightmap.h"
 #include "GPBFile.h"
 #include "Thread.h"
@@ -108,7 +109,7 @@ void Heightmap::generate(const std::vector<std::string>& nodeIds, int width, int
     __totalHeightmapScanlines = height;
 
     // Determine # of threads to spawn
-    int threadCount = std::min(THREAD_COUNT, height);
+    int threadCount = min(THREAD_COUNT, height);
 
     // Split the work into separate threads to make max use of available cpu cores and speed up computation.
     HeightmapThreadData* threadData = new HeightmapThreadData[threadCount];

gameplay-luagen/gameplay-luagen.vcxproj

@@ -126,10 +126,10 @@
       </Message>
     </CustomBuildStep>
     <PostBuildEvent>
-      <Command>copy $(TargetPath) $(ProjectDir)..\bin\win32\$(TargetFileName)</Command>
+      <Command>copy $(TargetPath) $(ProjectDir)..\bin\windows\$(TargetFileName)</Command>
     </PostBuildEvent>
     <PostBuildEvent>
-      <Message>Copying executable to bin/win32 folder ...</Message>
+      <Message>Copying executable to bin/windows folder ...</Message>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />