switch build system to gyp

3 files changed, 64 insertions, 69 deletions

diff --git a/macosx/CMakeLists.txt b/macosx/CMakeLists.txt
deleted file mode 100644
index 6178f1c2a6..0000000000
--- a/macosx/CMakeLists.txt
+++ /dev/null
@@ -1,60 +0,0 @@
-FIND_LIBRARY(COCOA_LIBRARY Cocoa)
-FIND_LIBRARY(OPENGL_LIBRARY OpenGL)
-FIND_LIBRARY(IOKIT_LIBRARY IOKit)
-FIND_LIBRARY(COREVIDEO_LIBRARY CoreVideo)
-
-FIND_PACKAGE(PkgConfig REQUIRED)
-PKG_SEARCH_MODULE(GLFW REQUIRED glfw3)
-
-
-SET(macosx_SOURCES
-    main.mm
-    settings.mm
-)
-
-SET(macosx_HEADERS
-)
-
-INCLUDE_DIRECTORIES(
-    ../include
-    ${GLFW_INCLUDE_DIRS}
-    ${Boost_INCLUDE_DIR}
-)
-
-LINK_DIRECTORIES(
-    ${GLFW_LIBRARY_DIRS}
-)
-
-# Define some settings for the Bundle
-set(MACOSX_BUNDLE_BUNDLE_NAME ${PROJECT_NAME})
-set(MACOSX_BUNDLE_GUI_IDENTIFIER "com.mapbox.llmr.native")
-set(MACOSX_BUNDLE_ICON_FILE "Icon.icns")
-set(MACOSX_BUNDLE_INFO_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
-set(MACOSX_BUNDLE_SHORT_VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
-set(MACOSX_BUNDLE_LONG_VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
-set(MACOSX_BUNDLE_BUNDLE_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
-set(MACOSX_BUNDLE_COPYRIGHT "(c) 2014 Mapbox")
-
-# Add Mac OS X specific icon
-list(APPEND macosx_RESOURCES Icon.icns)
-
-# Ensures that resources end up in the Resources folder
-set_source_files_properties(${macosx_RESOURCES} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
-
-add_executable(macosx MACOSX_BUNDLE
-    ${macosx_SOURCES}
-    ${macosx_RESOURCES}
-)
-
-
-set_target_properties(macosx PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/macosx/Info.plist.in)
-
-TARGET_LINK_LIBRARIES(macosx
-    llmr
-    ${COCOA_LIBRARY}
-    ${OPENGL_LIBRARY}
-    ${IOKIT_LIBRARY}
-    ${COREVIDEO_LIBRARY}
-    ${GLFW_LIBRARIES}
-    ${Boost_LIBRARIES}
-)
diff --git a/macosx/Info.plist.in b/macosx/Info.plist
index a77546b82f..88b4c38764 100644
--- a/macosx/Info.plist.in
+++ b/macosx/Info.plist
@@ -5,31 +5,31 @@
     <key>CFBundleDevelopmentRegion</key>
     <string>English</string>
     <key>CFBundleExecutable</key>
-    <string>${MACOSX_BUNDLE_EXECUTABLE_NAME}</string>
+    <string>${EXECUTABLE_NAME}</string>
     <key>CFBundleGetInfoString</key>
-    <string>${MACOSX_BUNDLE_INFO_STRING}</string>
+    <string>0.0.1</string>
     <key>CFBundleIconFile</key>
-    <string>${MACOSX_BUNDLE_ICON_FILE}</string>
+    <string>Icon.icns</string>
     <key>CFBundleIdentifier</key>
-    <string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string>
+    <string>com.mapbox.${PRODUCT_NAME:rfc1034identifier}</string>
     <key>CFBundleInfoDictionaryVersion</key>
     <string>6.0</string>
     <key>CFBundleLongVersionString</key>
-    <string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string>
+    <string>0.0.1</string>
     <key>CFBundleName</key>
-    <string>${MACOSX_BUNDLE_BUNDLE_NAME}</string>
+    <string>${PRODUCT_NAME}</string>
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleShortVersionString</key>
-    <string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
+    <string>0.0.1</string>
     <key>CFBundleSignature</key>
     <string>LLMR</string>
     <key>CFBundleVersion</key>
-    <string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
+    <string>0.0.1</string>
     <key>CSResourcesFileMapped</key>
     <true/>
     <key>NSHumanReadableCopyright</key>
-    <string>${MACOSX_BUNDLE_COPYRIGHT}</string>
+    <string>0.0.1</string>
     <key>NSHighResolutionCapable</key>
     <true/>
 </dict>
diff --git a/macosx/llmr-app.gyp b/macosx/llmr-app.gyp
new file mode 100644
index 0000000000..da23017120
--- /dev/null
+++ b/macosx/llmr-app.gyp
@@ -0,0 +1,55 @@
+{
+  'includes': [
+    '../common.gypi',
+    '../config.gypi'
+  ],
+  'targets': [
+    {
+        "target_name": "osxapp",
+        "product_name": "llmr",
+        "type": "executable",
+        "sources": [
+            "./main.mm",
+            "./settings.mm",
+            "./settings.hpp"
+        ],
+        'product_extension': 'app',
+        'mac_bundle': 1,
+        'mac_bundle_resources': [
+          'Icon.icns',
+        ],
+        'link_settings': {
+          'libraries': [
+            '$(SDKROOT)/System/Library/Frameworks/Cocoa.framework',
+            '$(SDKROOT)/System/Library/Frameworks/IOKit.framework',
+            '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework',
+            '$(SDKROOT)/System/Library/Frameworks/CoreVideo.framework',
+          ],
+        },
+        'xcode_settings': {
+          'ARCHS': [ "x86_64" ],
+          'SDKROOT': 'macosx',
+          'SUPPORTED_PLATFORMS':'macosx',
+          'OTHER_CPLUSPLUSFLAGS':[
+            '<@(glfw3_cflags)'
+          ],
+          'OTHER_CFLAGS':[
+            '<@(glfw3_cflags)'
+          ],
+          'OTHER_LDFLAGS': [
+            '-stdlib=libc++',
+            '<@(glfw3_libraries)',
+          ],
+          'SDKROOT': 'macosx',
+          'INFOPLIST_FILE': 'Info.plist',
+          'CLANG_CXX_LIBRARY': 'libc++',
+          'CLANG_CXX_LANGUAGE_STANDARD':'c++11',
+          'MACOSX_DEPLOYMENT_TARGET':'10.8',
+          'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0'
+        },
+        "dependencies": [
+            "../llmr.gyp:llmr-osx"
+        ]
+    }
+  ]
+}
\ No newline at end of file