move log.h include in each file instead of pch, link libcurl and compile for mac

engine/app.cpp

@@ -1,4 +1,5 @@
 #include "pch.h"
+#include "log.h"
 #include "app.h"
 
 using namespace ui;

engine/asset.cpp

@@ -1,4 +1,5 @@
 #include "pch.h"
+#include "log.h"
 #include "asset.h"
 
 #ifdef __ANDROID__

engine/bezier.cpp

@@ -1,4 +1,5 @@
 #include "pch.h"
+#include "log.h"
 #include "bezier.h"
 
 

engine/brush.cpp

@@ -1,8 +1,7 @@
 #include "pch.h"
+#include "log.h"
 #include "brush.h"
 
-
-
 void ui::BrushMesh::draw(const std::vector<StrokeSample>& samples, const glm::mat4& proj)
 {
     std::vector<instance_t> attributes;

engine/canvas.cpp

@@ -1,8 +1,7 @@
 #include "pch.h"
+#include "log.h"
 #include "canvas.h"
 
-
-
 void ui::Canvas::clear()
 {
     m_fb.bindFramebuffer();

engine/font.cpp

@@ -1,4 +1,5 @@
 #include "pch.h"
+#include "log.h"
 #include "font.h"
 #include "shader.h"
 #include "asset.h"

engine/image.cpp

@@ -1,4 +1,5 @@
 #include "pch.h"
+#include "log.h"
 #include "image.h"
 #include "asset.h"
 

engine/layout.cpp

@@ -1,4 +1,5 @@
 #include "pch.h"
+#include "log.h"
 #include "layout.h"
 #include "util.h"
 #include "asset.h"

engine/layout.h

@@ -1544,8 +1544,9 @@ public:
         
         if (dp != NULL)
         {
-            while (ep = readdir (dp))
-                names.push_back(ep->d_name);
+            while ((ep = readdir(dp)))
+                if (ep->d_type != DT_DIR)
+                    names.push_back(ep->d_name);
             closedir(dp);
         }
         else

engine/log.cpp

@@ -67,7 +67,7 @@ void LogRemote::log(const wchar_t* format, ...)
     static wchar_t buffer[4096];
     va_list arglist;
     va_start(arglist, format);
-    int n = _vsnwprintf(buffer, sizeof(buffer)/sizeof(wchar_t), format, arglist);
+    int n = vswprintf(buffer, sizeof(buffer)/sizeof(wchar_t), format, arglist);
     va_end(arglist);
 
     std::wstring string_to_convert(buffer, n);

engine/main.cpp

@@ -1,4 +1,5 @@
 #include "pch.h"
+#include "log.h"
 #include "shader.h"
 #include "shape.h"
 #include "texture.h"
@@ -264,7 +265,7 @@ static CVReturn MyDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTime
 {
     App::I.initLog();
     App::I.create();
-    NSRect r = NSMakeRect(0, 0, app.width, app.height);
+    NSRect r = NSMakeRect(0, 0, App::I.width, App::I.height);
 
     view = [[View alloc] initWithFrame:r];
     

engine/pch.h

@@ -5,6 +5,7 @@
 
 #ifdef __APPLE__
     #include <OpenGL/gl3.h>
+    #include <OpenGL/gl3ext.h>
     #include <sys/stat.h>
     #include <sys/types.h>
     #include <dirent.h>
@@ -73,5 +74,3 @@
 #include <stb/stb_truetype.h>
 #include <stb/stb_image.h>
 #include <curl/curl.h>
-
-#include "log.h"

engine/rtt.cpp

@@ -1,7 +1,7 @@
 #include "pch.h"
+#include "log.h"
 #include "rtt.h"
 
-
 RTT::RTT()
 {
     fboID = 0;

engine/shader.cpp

@@ -1,4 +1,5 @@
 #include "pch.h"
+#include "log.h"
 #include "shader.h"
 
 using namespace ui;

engine/shape.cpp

@@ -1,4 +1,5 @@
 #include "pch.h"
+#include "log.h"
 #include "shape.h"
 
 using namespace ui;

engine/texture.cpp

@@ -1,4 +1,5 @@
 #include "pch.h"
+#include "log.h"
 #include "texture.h"
 #include "util.h"
 

engine/util.cpp

@@ -1,4 +1,5 @@
 #include "pch.h"
+#include "log.h"
 #include "util.h"
 
 bool point_in_rect(const glm::vec2& p, const glm::vec4& r)