Merge pull request #12 from centaurean/dev

Dev merge

.appveyor.yml

@@ -0,0 +1,11 @@
+version: 1.0.6.{build}
+
+install:
+  - cd build
+  - ps: wget https://github.com/premake/premake-core/releases/download/v5.0.0.alpha4/premake-5.0.0.alpha4-windows.zip -OutFile premake5.zip
+  - 7z x premake5.zip
+  - del premake5.zip
+
+build_script:
+  - premake5 vs2013
+  - msbuild SpookyHash.sln

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "test/src/cputime"]
-	path = test/src/cputime
+[submodule "test/libs/cputime"]
+	path = test/libs/cputime
 	url = https://github.com/centaurean/cputime.git

.travis.yml

@@ -0,0 +1,10 @@
+language: c
+
+script:
+  - cd build
+  - wget https://github.com/premake/premake-core/releases/download/v5.0.0.alpha4/premake-5.0.0.alpha4-linux.tar.gz
+  - tar zxvf premake-5.0.0.alpha4-linux.tar.gz
+  - ./premake5 gmake
+  - make clean
+  - make
+  - ./spookyhash-test

CHANGELOG.md

@@ -5,6 +5,7 @@
 * Switched to premake 5
 * Updated API definitions
 * Added version information access in the API
+* Added build statuses
 
 1.0.5
 -----

README.md

@@ -9,6 +9,11 @@ The function allows a 128-bit seed. It's named SpookyHash because it was release
 
 Centaurean's release of SpookyHash integrates support for big endian platforms and multithreading via context variables.
 
+Branch | Linux | Windows
+--- | --- | ---
+Master | [![Build Status](https://travis-ci.org/centaurean/spookyhash.svg?branch=master)](https://travis-ci.org/centaurean/spookyhash) | [![Build status](https://ci.appveyor.com/api/projects/status/d3w4v68a5ws27g73/branch/master?svg=true)](https://ci.appveyor.com/project/gpnuma/spookyhash/branch/master)
+Dev | [![Build Status](https://travis-ci.org/centaurean/spookyhash.svg?branch=dev)](https://travis-ci.org/centaurean/spookyhash) | [![Build status](https://ci.appveyor.com/api/projects/status/d3w4v68a5ws27g73/branch/dev?svg=true)](https://ci.appveyor.com/project/gpnuma/spookyhash/branch/dev)
+
 Why use SpookyHash ?
 --------------------
 
@@ -32,7 +37,7 @@ To build a static and dynamic library, as well as a test binary of SpookyHash on
 
 or alternatively, on windows for example :
 
-    premake5.exe vs2010
+    premake5.exe vs2013
 
 Quick start
 -----------

build/premake5.lua

@@ -44,6 +44,7 @@ os.execute("git submodule update --init --recursive")
 
 solution "SpookyHash"
 	configurations { "Release" }
+	buildoptions { "-std=c99" }
 	flags { "OptimizeSpeed", "NoFramePointer", "LinkTimeOptimization" }
 
 	project "spookyhash-static"
@@ -68,7 +69,9 @@ solution "SpookyHash"
 		kind "ConsoleApp"
 		language "C"
 		files {
-			"../test/src/**.h",
-			"../test/src/**.c"
+			"../test/libs/**.h",
+			"../test/libs/**.c",
+			"../test/src/*.h",
+			"../test/src/*.c"
 		}
-		links { "spookyhash-static" }
+		links { "spookyhash-static" }

test/src/test.c

@@ -31,9 +31,8 @@
  */
 
 #include <string.h>
-#include "../../src/spookyhash_api.h"
 #include "../../src/spookyhash.h"
-#include "cputime/src/cputime.h"
+#include "../libs/cputime/src/cputime_api.h"
 
 uint64_t m_a;
 uint64_t m_b;