From b97def39b3a56736c27450fbd03b4cb28f926efa Mon Sep 17 00:00:00 2001
From: Nicolay Korslund <korslund@gmail.com>
Date: Wed, 7 Jul 2010 10:07:15 +0200
Subject: [PATCH] Minor fixes to Mac stuff

---
 CMakeLists.txt              | 3 ++-
 apps/openmw/main.cpp        | 2 +-
 components/misc/fileops.cpp | 3 +--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c0ae4460d8..0865ee20f6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -241,7 +241,8 @@ add_executable(openmw
     ${GAME}
     ${ESM_STORE} ${ESM_STORE_HEADER}
     ${GAMEREND} ${GAMEREND_HEADER}
-    MACOSX_BUNDLE
+# ???
+#   MACOSX_BUNDLE
     ${COMPONENTS} ${COMPONENTS_HEADER}
     ${OPENMW_LIBS} ${OPENMW_LIBS_HEADER}
     ${APPS} ${APPS_HEADER}
diff --git a/apps/openmw/main.cpp b/apps/openmw/main.cpp
index af196af668..c3bbe33c13 100644
--- a/apps/openmw/main.cpp
+++ b/apps/openmw/main.cpp
@@ -5,7 +5,7 @@
 
 #include <boost/program_options.hpp>
 
-#include "tools/fileops.hpp"
+#include <components/misc/fileops.hpp>
 #include "engine.hpp"
 
 using namespace std;
diff --git a/components/misc/fileops.cpp b/components/misc/fileops.cpp
index b7e3b389e6..9a0c947808 100644
--- a/components/misc/fileops.cpp
+++ b/components/misc/fileops.cpp
@@ -1,6 +1,5 @@
 #include "fileops.hpp"
 #include <boost/filesystem.hpp>
-
 #include <string>
 
 bool isFile(const char *name)
@@ -9,7 +8,7 @@ bool isFile(const char *name)
   return boost::filesystem::exists(cfg_file_path);
 }
 
-#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE
+#ifdef __MACOSX__
 #include <CoreFoundation/CoreFoundation.h>
 
 std::string macBundlePath()