omar/panopainter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
omigamedev
2017-04-02 16:57:56 +01:00
parent b6c9429b89
commit 2dc7c4a9cc
18 changed files with 34 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
engine.xcodeproj/project.pbxproj
View File

@@ -27,6 +27,8 @@
AD58E0761E3421F2006ACC15 /* YGNodeList.c in Sources */ = {isa = PBXBuildFile; fileRef = AD58E0741E3421F2006ACC15 /* YGNodeList.c */; };
AD58E0771E3421F2006ACC15 /* Yoga.c in Sources */ = {isa = PBXBuildFile; fileRef = AD58E0751E3421F2006ACC15 /* Yoga.c */; };
AD58E0791E342205006ACC15 /* tinyxml2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD58E0781E342205006ACC15 /* tinyxml2.cpp */; };
AD8CF7211E913F0500083FFD /* log.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD8CF71F1E913F0500083FFD /* log.cpp */; };
AD8CF7231E914DE400083FFD /* libcurl.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = AD8CF7221E914DE400083FFD /* libcurl.tbd */; };
AD95AEC61E41EDEC002DD03A /* font.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD95AEC31E41EDEC002DD03A /* font.cpp */; };
AD95AEC71E41EDEC002DD03A /* pch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD95AEC51E41EDEC002DD03A /* pch.cpp */; };
ADB61C821E3D38450093280F /* util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADB61C801E3D38450093280F /* util.cpp */; };
@@ -79,6 +81,9 @@
AD58E0741E3421F2006ACC15 /* YGNodeList.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = YGNodeList.c; path = libs/yoga/yoga/YGNodeList.c; sourceTree = "<group>"; };
AD58E0751E3421F2006ACC15 /* Yoga.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = Yoga.c; path = libs/yoga/yoga/Yoga.c; sourceTree = "<group>"; };
AD58E0781E342205006ACC15 /* tinyxml2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = tinyxml2.cpp; path = libs/tinyxml2/tinyxml2.cpp; sourceTree = "<group>"; };
AD8CF71F1E913F0500083FFD /* log.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = log.cpp; sourceTree = "<group>"; };
AD8CF7201E913F0500083FFD /* log.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = log.h; sourceTree = "<group>"; };
AD8CF7221E914DE400083FFD /* libcurl.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libcurl.tbd; path = usr/lib/libcurl.tbd; sourceTree = SDKROOT; };
AD95AEC31E41EDEC002DD03A /* font.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = font.cpp; sourceTree = "<group>"; };
AD95AEC41E41EDEC002DD03A /* font.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = font.h; sourceTree = "<group>"; };
AD95AEC51E41EDEC002DD03A /* pch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pch.cpp; sourceTree = "<group>"; };
@@ -91,6 +96,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
AD8CF7231E914DE400083FFD /* libcurl.tbd in Frameworks */,
AD58E0601E12DA86006ACC15 /* CoreVideo.framework in Frameworks */,
AD58E05E1E10754F006ACC15 /* CoreFoundation.framework in Frameworks */,
AD58E05C1E107536006ACC15 /* Cocoa.framework in Frameworks */,
@@ -104,6 +110,7 @@
AD58E0461E107411006ACC15 = {
isa = PBXGroup;
children = (
AD8CF7221E914DE400083FFD /* libcurl.tbd */,
AD58E0731E3421CB006ACC15 /* libs */,
AD58E0611E17F23D006ACC15 /* data */,
AD58E05F1E12DA86006ACC15 /* CoreVideo.framework */,
@@ -126,6 +133,8 @@
AD58E0511E107411006ACC15 /* engine */ = {
isa = PBXGroup;
children = (
AD8CF71F1E913F0500083FFD /* log.cpp */,
AD8CF7201E913F0500083FFD /* log.h */,
AD4C08CF1E89BD0F0051D85F /* asset.cpp */,
AD4C08D01E89BD0F0051D85F /* asset.h */,
AD4C08D11E89BD0F0051D85F /* bezier.cpp */,
@@ -242,6 +251,7 @@
AD58E0681E2A7741006ACC15 /* image.cpp in Sources */,
AD58E0771E3421F2006ACC15 /* Yoga.c in Sources */,
AD4C08DB1E89BD0F0051D85F /* brush.cpp in Sources */,
AD8CF7211E913F0500083FFD /* log.cpp in Sources */,
AD95AEC71E41EDEC002DD03A /* pch.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -292,7 +302,9 @@
libs/glm,
libs/yoga,
libs/tinyxml2,
/opt/local/include,
);
LIBRARY_SEARCH_PATHS = /opt/local/lib;
MACOSX_DEPLOYMENT_TARGET = 10.11;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
@@ -337,7 +349,9 @@
libs/glm,
libs/yoga,
libs/tinyxml2,
/opt/local/include,
);
LIBRARY_SEARCH_PATHS = /opt/local/lib;
MACOSX_DEPLOYMENT_TARGET = 10.11;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = macosx;

1
engine/app.cpp
View File

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

1
engine/asset.cpp
View File

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

1
engine/bezier.cpp
View File

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

3
engine/brush.cpp
View File

@@ -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;

3
engine/canvas.cpp
View File

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

1
engine/font.cpp
View File

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

1
engine/image.cpp
View File

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

1
engine/layout.cpp
View File

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

5
engine/layout.h
View File

@@ -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

2
engine/log.cpp
View File

@@ -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);

3
engine/main.cpp
View File

@@ -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];

3
engine/pch.h
View File

@@ -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"

2
engine/rtt.cpp
View File

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

1
engine/shader.cpp
View File

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

1
engine/shape.cpp
View File

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

1
engine/texture.cpp
View File

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

1
engine/util.cpp
View File

@@ -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)