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

fix Xcode project, add sequencer class files

Browse Source
This commit is contained in:
omigamedev
2017-05-31 08:45:18 +01:00
parent 73c58196b5
commit c55007e8bf
4 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
engine.xcodeproj/project.pbxproj
View File

@@ -7,6 +7,9 @@
objects = {
/* Begin PBXBuildFile section */
AD02F0C21EDC456800B2E692 /* sequencer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD02F0C01EDC456800B2E692 /* sequencer.cpp */; };
AD02F0C31EDC457C00B2E692 /* sequencer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD02F0C01EDC456800B2E692 /* sequencer.cpp */; };
AD02F0C41EDC457C00B2E692 /* sequencer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD02F0C01EDC456800B2E692 /* sequencer.cpp */; };
AD0E11971ECA20F200CDA6BB /* app_events.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD0E11921ECA20F200CDA6BB /* app_events.cpp */; };
AD0E11981ECA20F200CDA6BB /* app_layout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD0E11931ECA20F200CDA6BB /* app_layout.cpp */; };
AD0E11991ECA20F200CDA6BB /* app_shaders.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD0E11941ECA20F200CDA6BB /* app_shaders.cpp */; };
@@ -205,6 +208,8 @@
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
AD02F0C01EDC456800B2E692 /* sequencer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sequencer.cpp; sourceTree = "<group>"; };
AD02F0C11EDC456800B2E692 /* sequencer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sequencer.h; sourceTree = "<group>"; };
AD0E11921ECA20F200CDA6BB /* app_events.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = app_events.cpp; sourceTree = "<group>"; };
AD0E11931ECA20F200CDA6BB /* app_layout.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = app_layout.cpp; sourceTree = "<group>"; };
AD0E11941ECA20F200CDA6BB /* app_shaders.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = app_shaders.cpp; sourceTree = "<group>"; };
@@ -519,6 +524,8 @@
AD58E06C1E2A78BD006ACC15 /* pch.h */,
AD4C08D71E89BD0F0051D85F /* rtt.cpp */,
AD4C08D81E89BD0F0051D85F /* rtt.h */,
AD02F0C01EDC456800B2E692 /* sequencer.cpp */,
AD02F0C11EDC456800B2E692 /* sequencer.h */,
AD58E0631E2A76FD006ACC15 /* shader.cpp */,
AD58E0641E2A76FD006ACC15 /* shader.h */,
AD58E06D1E2A80BC006ACC15 /* shape.cpp */,
@@ -720,6 +727,7 @@
AD0E5CB51ECC72AD00C35669 /* YGNodeList.c in Sources */,
AD0E5CE11ECC72AD00C35669 /* shape.cpp in Sources */,
AD0E5CDF1ECC72AD00C35669 /* rtt.cpp in Sources */,
AD02F0C41EDC457C00B2E692 /* sequencer.cpp in Sources */,
AD0E5CCD1ECC72AD00C35669 /* node_text_input.cpp in Sources */,
AD0E5CE21ECC72AD00C35669 /* texture.cpp in Sources */,
AD0E5CCC1ECC72AD00C35669 /* node_stroke_preview.cpp in Sources */,
@@ -778,6 +786,7 @@
AD1063831EC7ADFA002A525F /* node_checkbox.cpp in Sources */,
AD3B1EC01E3B8B7600E918E3 /* layout.cpp in Sources */,
AD58E0721E2A90EF006ACC15 /* app.cpp in Sources */,
AD02F0C21EDC456800B2E692 /* sequencer.cpp in Sources */,
AD4C08DC1E89BD0F0051D85F /* canvas.cpp in Sources */,
AD95AEC61E41EDEC002DD03A /* font.cpp in Sources */,
AD1063911EC7ADFA002A525F /* node_stroke_preview.cpp in Sources */,
@@ -855,6 +864,7 @@
ADD7D2A11EBF9E1C00D5A897 /* texture.cpp in Sources */,
AD0E119C1ECA215600CDA6BB /* app_events.cpp in Sources */,
ADD7D2961EBF9E1C00D5A897 /* brush.cpp in Sources */,
AD02F0C31EDC457C00B2E692 /* sequencer.cpp in Sources */,
AD1063A51EC7AE92002A525F /* node_panel_stroke.cpp in Sources */,
ADD7D2911EBF9E1C00D5A897 /* event.cpp in Sources */,
ADD7D2A41EBFA06F00D5A897 /* YGNodeList.c in Sources */,
@@ -899,6 +909,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_CXX_LANGUAGE_STANDARD = "c++14";
CLANG_ENABLE_MODULES = NO;
COMBINE_HIDPI_IMAGES = YES;
INFOPLIST_FILE = "PanoPainter-OSX/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
@@ -912,6 +923,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_CXX_LANGUAGE_STANDARD = "c++14";
CLANG_ENABLE_MODULES = NO;
COMBINE_HIDPI_IMAGES = YES;
INFOPLIST_FILE = "PanoPainter-OSX/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
@@ -1085,6 +1097,7 @@
AD0E5CAB1ECC6F2B00C35669 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
AD58E04A1E107411006ACC15 /* Build configuration list for PBXProject "engine" */ = {
isa = XCConfigurationList;

2
engine/log.cpp
View File

@@ -17,7 +17,9 @@ void LogRemote::start()
m_running = true;
m_thread = std::thread([&] {
#ifdef _WIN32
BT_SetTerminate();
#endif
net_init();
auto session_string = net_request("/start");
m_session = atoi(session_string.c_str());

3
engine/sequencer.cpp Normal file
View File

@@ -0,0 +1,3 @@
#include "pch.h"
#include "sequencer.h"

6
engine/sequencer.h Normal file
View File

@@ -0,0 +1,6 @@
#pragma once
class Sequencer
{
};