cfeck / imagezero Goto Github PK

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a88fc42..8ddb9e8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,12 @@ set(iz_SRCS
 
 add_definitions(-DHAVE_MMAP)
 
-set(CMAKE_EXE_LINKER_FLAGS "-Wl,-O1,-s,--no-export-dynamic")
+
+if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    set(CMAKE_EXE_LINKER_FLAGS "-Wl,-O1,-s,--no-export-dynamic")
+else()
+    set(CMAKE_EXE_LINKER_FLAGS "")
+endif()
 set(CMAKE_CXX_FLAGS_RELEASE "-O2 -mmmx -mtune=atom -Winline -W -Wall -fomit-frame-pointer -fno-rtti -fno-exceptions")
 
 add_executable(iz ${iz_SRCS})
diff --git a/file.cpp b/file.cpp
index 53a295a..cfdb3a0 100644
--- a/file.cpp
+++ b/file.cpp
@@ -14,6 +14,16 @@
 #include <sys/mman.h>
 #include <sys/stat.h>
 
+#if (defined(__APPLE__) && defined(__MACH__))
+# if defined(__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__)
+#  define __PLATFORM_IOS__
+# else
+#  define __PLATFORM_MACOS__
+# endif
+#elif defined(macintosh) || defined(Macintosh)
+# define __PLATFORM_MACOS__
+#endif
+
 class InputFile::Private
 {
 public:
@@ -31,7 +41,11 @@ InputFile::InputFile(const char *filename)
         struct stat sb;
         fstat(fd, &sb);
         d->size = sb.st_size;
+#if defined(__PLATFORM_MACOS__)
+        d->addr = mmap(0, d->size, PROT_READ, MAP_PRIVATE, fd, 0);
+#else
         d->addr = mmap(0, d->size, PROT_READ, MAP_PRIVATE | MAP_POPULATE, fd, 0);
+#endif
         if (d->addr == MAP_FAILED) {
             d->addr = mmap(0, d->size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
             if (d->addr != MAP_FAILED) {