Changed default build type to Release; Updated appveyor.yaml

mlomb · Jun 5, 2018 · 747343d · 747343d
1 parent 230d749
commit 747343d
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 11 deletions.
diff --git a/Code/include/OE/Misc/MemoryPool.hpp b/Code/include/OE/Misc/MemoryPool.hpp
@@ -6,14 +6,14 @@
 namespace OrbitEngine {	namespace Misc {
 	class MemoryPool {
 	public:
-		MemoryPool(size_t size, int capacity);
+		MemoryPool(unsigned long long size, int capacity);
 		virtual ~MemoryPool();
 
 		virtual void* allocate();
 		virtual void deallocate(void* ptr);
 
 	private:
-		size_t m_Size;
+		unsigned long long m_Size;
 		int m_Capacity;
 
 		int m_Free;
@@ -23,7 +23,7 @@ namespace OrbitEngine {	namespace Misc {
 
 	class TrackedMemoryPool : public MemoryPool {
 	public:
-		TrackedMemoryPool(size_t size, int capacity);
+		TrackedMemoryPool(unsigned long long size, int capacity);
 		~TrackedMemoryPool();
 
 		void* allocate() override;

diff --git a/Code/src/OE/Misc/MemoryPool.cpp b/Code/src/OE/Misc/MemoryPool.cpp
@@ -3,7 +3,7 @@
 #include <iostream>
 
 namespace OrbitEngine {	namespace Misc {
-	MemoryPool::MemoryPool(size_t size, int capacity)
+	MemoryPool::MemoryPool(unsigned long long size, int capacity)
 		: m_Size(size), m_Capacity(capacity)
 	{
 		m_Memory = new unsigned char[m_Size * capacity];
@@ -45,7 +45,7 @@ namespace OrbitEngine {	namespace Misc {
 		++m_Free;
 	}
 
-	TrackedMemoryPool::TrackedMemoryPool(size_t size, int capacity)
+	TrackedMemoryPool::TrackedMemoryPool(unsigned long long size, int capacity)
 		: MemoryPool(size, capacity)
 	{
 		m_Used.resize(capacity);

diff --git a/Tools/Build/Linux/build.sh b/Tools/Build/Linux/build.sh
@@ -10,4 +10,4 @@ echo "Build Path: $BuildRoot"
 
 mkdir -p "$BuildRoot"
 cd "$BuildRoot"
-cmake "$ScriptRoot"
+cmake -DCMAKE_BUILD_TYPE=Release "$ScriptRoot"
diff --git a/Tools/Build/Windows/build_windows.ps1 b/Tools/Build/Windows/build_windows.ps1
@@ -5,5 +5,5 @@ $ScriptRoot = Split-Path $MyInvocation.MyCommand.Path
 echo "********** BUILDING FOR WINDOWS ON WINDOWS **********"
 
 Push-Location $buildPath
-cmake.exe "$basePath"
+cmake -DCMAKE_BUILD_TYPE=Release "$basePath"
 Pop-Location
diff --git a/appveyor.yml b/appveyor.yml
@@ -3,11 +3,14 @@ image:
 - Ubuntu
 - Visual Studio 2015
 install:
+- sh: sudo apt-get install uuid-dev
 - git submodule update --init --recursive
 before_build:
-- cmd: . "Tools/Build/Windows/build_windows.ps1"
+- cmd: powershell -command ". \"Tools/Build/Windows/build_windows.ps1\""
 - sh: . "Tools/Build/Linux/build.sh"
-build: off
 build_script:
-- cmd: msbuild Build/Windows/OrbitEngine.sln
-- sh: cd Build/Linux/ && make
+- cmd: msbuild Build/Windows/OrbitEngine.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+- sh: make
+after_build:
+- cmd: appveyor PushArtifact Build/Windows/Release/OrbitEngine.lib
+- sh: appveyor PushArtifact Build/Linux/OrbitEngine.lib