Merge branch 'linux' of openspace.itn.liu.se:/openspace into linux

ext/FindSGCT.cmake

@@ -96,7 +96,7 @@ if (APPLE)
     set(SGCT_DEPENDENCIES ${SGCT_DEPENDENCIES} ${FRAMEWORK_IOKit} ${FRAMEWORK_CoreVideo} ${FRAMEWORK_Cocoa})
 endif (APPLE)
 
-if(UNIX)
+if(UNIX AND NOT APPLE)
 	find_package(XRandR)
 	find_package(Xi)
 	if(NOT XRANDR_FOUND)
@@ -106,7 +106,7 @@ if(UNIX)
 		message(FATAL_ERROR "Xi not found!")
 	endif(NOT XI_FOUND)
 	set(SGCT_DEPENDENCIES ${SGCT_DEPENDENCIES} ${XRANDR_LIBRARIES} ${XI_LIBRARIES})
-endif(UNIX)
+endif(UNIX AND NOT APPLE)
 
 # includes
 set(SGCT_INCLUDES "${SGCT_ROOT_DIR}/include")

src/CMakeLists.txt

@@ -109,16 +109,18 @@ if (APPLE)
     )
     set(SGCT_DEPENDENCIES ${SGCT_DEPENDENCIES} ${FRAMEWORK_IOKit} ${FRAMEWORK_CoreVideo} ${FRAMEWORK_Cocoa})
 endif (APPLE)
-#add_definitions(-framework IOKit -framework CoreVideo)
 
 if (APPLE)
 	add_definitions(-D__APPLE__)
 	set(CMAKE_CXX_FLAGS "-std=c++11 -stdlib=libc++ ${CMAKE_CXX_FLAGS}")
+    if(NOT CMAKE_GENERATOR STREQUAL Xcode)
+        message(WARNING "You are not using Xcode, OpenSpace assumes that working directory path to top level is \"../../..\"")
+    endif(NOT CMAKE_GENERATOR STREQUAL Xcode)
 endif (APPLE)
-if (UNIX)
+if (UNIX AND NOT APPLE)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -ggdb")
-	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_SOURCE_DIR}/bin/")
-endif (UNIX)
+    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_SOURCE_DIR}/bin/")
+endif (UNIX AND NOT APPLE)
 
 
 add_executable(OpenSpace ${OPENSPACE_HEADER} ${OPENSPACE_SOURCE})

src/openspaceengine.cpp

@@ -88,7 +88,7 @@ void OpenSpaceEngine::create(int argc, char** argv, int& newArgc, char**& newArg
 #ifdef __WIN32__
     // Windows: Binary two folders down
 	FileSys.registerPathToken("${BASE_PATH}", "../..");
-#elif __APPLE_
+#elif __APPLE__
     // OS X : Binary three folders down
 	FileSys.registerPathToken("${BASE_PATH}", "../../..");
 #else