LUS Cleanup: Merge Window and GlobalCtx2 classes.#1259
Merged
Kenix3 merged 8 commits intoHarbourMasters:develop-zhorafrom Aug 22, 2022
Merged
LUS Cleanup: Merge Window and GlobalCtx2 classes.#1259Kenix3 merged 8 commits intoHarbourMasters:develop-zhorafrom
Kenix3 merged 8 commits intoHarbourMasters:develop-zhorafrom
Conversation
briaguya0
approved these changes
Aug 19, 2022
Contributor
briaguya0
left a comment
There was a problem hiding this comment.
looks good overall
just gotta make sure jenkins is happy across all platforms
Comment on lines
+305
to
+308
| FolderManager folderManager; | ||
| std::string fpath = std::string(folderManager.pathForDirectory(NSApplicationSupportDirectory, NSUserDomainMask)); | ||
| fpath.append("/com.shipofharkinian.soh"); | ||
| return fpath; |
Contributor
There was a problem hiding this comment.
these lines match up with jenkins being mad
Contributor
There was a problem hiding this comment.
@dcvz any chance you could pull this branch and work through these mac errors?
15:31:48 /Users/jenkins/workspace/SoH_Multibranch_PR-1259/libultraship/libultraship/Window.cpp:305:9: error: unknown type name 'FolderManager'
15:31:48 FolderManager folderManager;
15:31:48 ^
15:31:48 /Users/jenkins/workspace/SoH_Multibranch_PR-1259/libultraship/libultraship/Window.cpp:306:72: error: use of undeclared identifier 'NSApplicationSupportDirectory'
15:31:48 std::string fpath = std::string(folderManager.pathForDirectory(NSApplicationSupportDirectory, NSUserDomainMask));
15:31:48 ^
15:31:48 /Users/jenkins/workspace/SoH_Multibranch_PR-1259/libultraship/libultraship/Window.cpp:306:103: error: use of undeclared identifier 'NSUserDomainMask'
15:31:48 std::string fpath = std::string(folderManager.pathForDirectory(NSApplicationSupportDirectory, NSUserDomainMask));
15:31:48 ^
15:31:48 3 errors generated.
Contributor
There was a problem hiding this comment.
Left you a comment on the line I think you’re missing
dcvz
reviewed
Aug 19, 2022
| #include "spdlog/sinks/stdout_color_sinks.h" | ||
| #include "spdlog/sinks/sohconsole_sink.h" | ||
| #ifdef __APPLE__ | ||
| #include "OSXFolderManager.h" |
Contributor
There was a problem hiding this comment.
@briaguya-ai im on my mobile and haven’t been able to verify on machine but I think you’re missing this import.
Kenix3
added a commit
to Kenix3/Shipwright
that referenced
this pull request
Oct 19, 2022
* Merges GlobalCtx2 and Window classes. * Includes condition variable in File. * add mac specific include * sstream to get past "implicit instantiation of undefined template" error * switch/wiiu includes * that file doesn't exist * more wii u globalctx2 stuff Co-authored-by: briaguya <briaguya@alice>
dcvz
pushed a commit
to briaguya0/Shipwright
that referenced
this pull request
Nov 12, 2022
* Merges GlobalCtx2 and Window classes. * Includes condition variable in File. * add mac specific include * sstream to get past "implicit instantiation of undefined template" error * switch/wiiu includes * that file doesn't exist * more wii u globalctx2 stuff Co-authored-by: briaguya <briaguya@alice>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.