Merge branch 'test2' into filenames

.gitignore

@@ -1,40 +1,6 @@
-*.o
-*.so
-*.a
-*.dll
-*.DLL
-test
-testmain
-VisualStudio/*.user
-VisualStudio/Debug/
-VisualStudio/Release/
-*.opensdf
-*.sdf
-*.suo
-bin/
-libs/
-gen/
-obj/
-*.apk
-*.ap_
-*.dex
-*.class
-local.properties
-*.pydevproject
-.project
-.metadata
-bin/**
-tmp/**
-tmp/**/*
+build/
 *.tmp
 *.bak
 *.swp
-*~.nib
-local.properties
-.classpath
-.settings/
-.loadpath
-.externalToolBuilders/
-*.launch
-.cproject
-.buildpath
+android/libs/
+android/obj/

CMakeLists.txt

@@ -0,0 +1,36 @@
+cmake_minimum_required(VERSION 3.5.1)
+project(CrossGuid)
+
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake")
+
+option(XG_TESTS "Build test runner" ON)
+
+include_directories(.)
+set(CMAKE_CXX_STANDARD 11)
+
+add_library(xg Guid.cpp)
+
+if (XG_TESTS)
+	add_executable(xgtest test/TestMain.cpp test/Test.cpp)
+	target_link_libraries(xgtest xg)
+endif()
+
+
+if(WIN32)
+	add_definitions(-DGUID_WINDOWS)
+elseif(APPLE)
+	find_library(CFLIB CoreFoundation)
+	target_link_libraries(xg ${CFLIB})
+	add_definitions(-DGUID_CFUUID)
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic")
+else()
+	find_package(Libuuid REQUIRED)
+	if (NOT LIBUUID_FOUND)
+		message(FATAL_ERROR
+			"You might need to run 'sudo apt-get install uuid-dev' or similar")
+	endif()
+	include_directories(${LIBUUID_INCLUDE_DIR})
+	target_link_libraries(xg ${LIBUUID_LIBRARY})
+	add_definitions(-DGUID_LIBUUID)
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic")
+endif()