drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 7 Pull Requests Actions Releases 9 Activity

[nostalgia] Update Ox includes

Browse Source
This commit is contained in:
Gary Talent 2018-09-01 14:46:24 -05:00
parent e4e8f141b6
commit 1f4781f06a
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.vscode/c_cpp_properties.json vendored
View File

@ -23,7 +23,7 @@
"${workspaceRoot}" "${workspaceRoot}"
], ],
"limitSymbolsToIncludedHeaders": true, "limitSymbolsToIncludedHeaders": true,
"databaseFilename": "${workspaceRoot}/build/current/compile_commands.json" "databaseFilename": ""
}, },
"macFrameworkPath": [ "macFrameworkPath": [
"/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk/System/Library/Frameworks" "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk/System/Library/Frameworks"
@ -56,8 +56,9 @@
"${workspaceRoot}" "${workspaceRoot}"
], ],
"limitSymbolsToIncludedHeaders": true, "limitSymbolsToIncludedHeaders": true,
"databaseFilename": "${workspaceRoot}/build/current/compile_commands.json" "databaseFilename": ""
} },
"compileCommands": "${workspaceFolder}/deps/ox/build/linux-x86_64-debug/compile_commands.json"
}, },
{ {
"name": "Win32", "name": "Win32",
@ -80,5 +81,5 @@
} }
} }
], ],
"version": 3 "version": 4
} }

2
src/nostalgia/common/point.hpp
View File

@ -8,7 +8,7 @@
#pragma once #pragma once
#include <ox/std/types.hpp> #include <ox/std/error.hpp>
namespace nostalgia { namespace nostalgia {
namespace common { namespace common {

2
src/nostalgia/studio/lib/json_read.hpp
View File

@ -12,7 +12,7 @@
#include <QJsonObject> #include <QJsonObject>
#include <QJsonDocument> #include <QJsonDocument>
#include <ox/std/types.hpp> #include <ox/std/error.hpp>
#include "json_err.hpp" #include "json_err.hpp"

2
src/nostalgia/studio/lib/json_write.hpp
View File

@ -12,7 +12,7 @@
#include <QJsonObject> #include <QJsonObject>
#include <QJsonDocument> #include <QJsonDocument>
#include <ox/std/types.hpp> #include <ox/std/error.hpp>
#include "json_err.hpp" #include "json_err.hpp"