makefile cleanup + icon

6 files changed, 6 insertions, 70 deletions

diff --git a/Makefile b/Makefile
deleted file mode 100644
index ca26e61495..0000000000
--- a/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-CXXFLAGS = -O2 -Wall -Wextra -std=c++11 -stdlib=libc++ -fno-exceptions
-CPPFLAGS = -DDEBUG
-INCLUDE  = -Iinclude
-
-
-
-SRCS    += src/map/map.cpp
-SRCS    += src/map/tile.cpp
-SRCS    += src/map/transform.cpp
-SRCS    += src/geometry/linevertexbuffer.cpp
-SRCS    += src/renderer/painter.cpp
-SRCS    += src/renderer/shader.cpp
-SRCS    += src/renderer/shader-fill.cpp
-SRCS    += src/renderer/shader-line.cpp
-SRCS    += src/shader/shaders.c
-SRCS    += src/util/mat4.c
-
-# OBJS     = $(patsubst %.mm,%.o,$(patsubst %.cpp,%.o,$(patsubst %.c,%.o,$(SRCS))))
-
-main: macosx
-
-macosx: SRCS += macosx/main.mm
-emscripten: SRCS += emscripten/main.cpp
-emscripten3: SRCS += emscripten/main.cpp
-
-macosx emscripten emscripten3: OBJS = $(patsubst %.mm,%.o,$(patsubst %.cpp,%.o,$(patsubst %.c,%.o,$(SRCS))))
-
-%.o: %.cpp
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(INCLUDE) -c -o $@ $^
-
-%.o: %.mm
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(INCLUDE) -c -o $@ $^
-
-%.o: %.c
-	$(CC) $(CPPFLAGS) $(INCLUDE) -c -o $@ $^
-
-
-.SECONDEXPANSION:
-macosx: $$(OBJS)
-	$(CXX) -O3 $(OBJS) $(INCLUDE) -lglfw3 -framework OpenGL -framework Foundation -o macosx/main
-
-emscripten: $$(OBJS)
-	$(CXX) $(OBJS) $(INCLUDE) -o emscripten/main.js
-
-emscripten3: $$(OBJS)
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(OBJS) $(INCLUDE) -s DOUBLE_MODE=0 -s FORCE_ALIGNED_MEMORY=1 -s PRECISE_I64_MATH=0 --closure 1 -o emscripten/main.js
-	uglifyjs emscripten/main.js -mc > emscripten/main.dist.js
-	gzip -c emscripten/main.dist.js > emscripten/main.dist.js.gz
-
-clean:
-	rm -rf */*.o */*/*.o
-	rm -rf macosx/main emscripten/main.js emscripten/main.js.map
-
-.PHONY: macosx emscripten
diff --git a/include/llmr/renderer/painter.hpp b/include/llmr/renderer/painter.hpp
index 0ae70eebdf..34f9611a31 100644
--- a/include/llmr/renderer/painter.hpp
+++ b/include/llmr/renderer/painter.hpp
@@ -11,7 +11,7 @@ class tile;
 
 class painter {
 public:
-    painter(class transform *tranform);
+    painter(class transform *transform);
 
     void setup();
     void teardown();
diff --git a/macosx/ATTRIBUTION b/macosx/ATTRIBUTION
new file mode 100644
index 0000000000..dff33b3b9a
--- /dev/null
+++ b/macosx/ATTRIBUTION
@@ -0,0 +1 @@
+Icon from http://dryicons.com/icon/architecture-blueprint-icons-set/map/
\ No newline at end of file
diff --git a/macosx/CMakeLists.txt b/macosx/CMakeLists.txt
index 0ac0d4e441..2e41a7a5a5 100644
--- a/macosx/CMakeLists.txt
+++ b/macosx/CMakeLists.txt
@@ -1,7 +1,7 @@
 FIND_LIBRARY(COCOA_LIBRARY Cocoa)
 FIND_LIBRARY(OPENGL_LIBRARY OpenGL)
 FIND_LIBRARY(IOKIT_LIBRARY IOKit)
-FIND_LIBRARY(COREVIDEO_LIBRARY CoreVidoe)
+FIND_LIBRARY(COREVIDEO_LIBRARY CoreVideo)
 
 FIND_PACKAGE(PkgConfig REQUIRED)
 PKG_SEARCH_MODULE(GLFW REQUIRED glfw3)
@@ -27,7 +27,7 @@ LINK_DIRECTORIES(
 # 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 "macosx.icns")
+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}")
@@ -35,7 +35,7 @@ set(MACOSX_BUNDLE_BUNDLE_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PA
 set(MACOSX_BUNDLE_COPYRIGHT "(c) 2014 Mapbox")
 
 # Add Mac OS X specific icon
-#list(APPEND macosx_RESOURCES ../resources/macosx.icns)
+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)
@@ -53,6 +53,6 @@ TARGET_LINK_LIBRARIES(macosx
     ${COCOA_LIBRARY}
     ${OPENGL_LIBRARY}
     ${IOKIT_LIBRARY}
-    ${COREVIDOE_LIBRARY}
+    ${COREVIDEO_LIBRARY}
     ${GLFW_LIBRARIES}
 )
diff --git a/macosx/Icon.icns b/macosx/Icon.icns
new file mode 100644
index 0000000000..ab5ae136ff
--- /dev/null
+++ b/macosx/Icon.icns
diff --git a/src/renderer/painter.cpp b/src/renderer/painter.cpp
index e231852d29..3fdddf4e78 100644
--- a/src/renderer/painter.cpp
+++ b/src/renderer/painter.cpp
@@ -168,7 +168,6 @@ void painter::render(tile::ptr tile) {
     glLineWidth(4.0f);
     glDrawArrays(GL_LINE_STRIP, 0, sizeof(tile_border_vertices));
 
-
     // draw debug info
     switchShader(lineShader);
     glUniformMatrix4fv(lineShader->u_matrix, 1, GL_FALSE, matrix);
@@ -180,16 +179,6 @@ void painter::render(tile::ptr tile) {
     glUniform4f(lineShader->u_color, 0.0f, 0.0f, 0.0f, 1.0f);
     glLineWidth(2.0f);
     glDrawArrays(GL_LINES, 0, tile->debugFontVertex.length());
-
-    //     gl.bindBuffer(gl.ARRAY_BUFFER, painter.textBuffer);
-    // gl.bufferData(gl.ARRAY_BUFFER, new Int16Array(vertices), gl.STREAM_DRAW);
-    // gl.vertexAttribPointer(painter.debugShader.a_pos, painter.bufferProperties.textItemSize, gl.SHORT, false, 0, 0);
-    // gl.lineWidth(8 * window.devicePixelRatio);
-    // gl.uniform4f(painter.debugShader.u_color, 1, 1, 1, 1);
-    // gl.drawArrays(gl.LINES, 0, vertices.length / painter.bufferProperties.textItemSize);
-    // gl.lineWidth(2 * window.devicePixelRatio);
-    // gl.uniform4f(painter.debugShader.u_color, 0, 0, 0, 1);
-    // gl.drawArrays(gl.LINES, 0, vertices.length / painter.bufferProperties.textItemSize);
 }
 
 void painter::viewport() {