Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Windows Fixes. #95

Merged
merged 1 commit into from
Jul 22, 2023
Merged

Windows Fixes. #95

merged 1 commit into from
Jul 22, 2023

Conversation

guilt
Copy link
Contributor

@guilt guilt commented Jun 11, 2023

Hi,

This is primarily just a PR for VC++ on Windows. TL;DR:

  • Update ggsock to HEAD for std::min and std::max
  • C arrays can't be initialized with variable length values without some wierd mode in that compiler. So I just changed the behavior.
  • Fix for CMakeLists.txt to make a static lib on Windows (not just MinGW).
  • Fix for unistd.h and dlfcn.h not truly part of Windows (MinGW may have it not MSVC).
  • Fix for README-tmpl.md so that when README.md autogenerates it is not changed per Git.

.gitmodules Outdated
@@ -3,7 +3,7 @@
url = https://github.com/ocornut/imgui
[submodule "examples/third-party/ggsock"]
path = examples/third-party/ggsock
url = https://github.com/ggerganov/ggsock
url = git@github.com:guilt/ggsock.git
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can first merge the ggsock changes and then keep the submodule pointing to https://github.com/ggerganov/ggsock

@guilt
Copy link
Contributor Author

guilt commented Jul 21, 2023

@ggerganov Please see PR: ggerganov/ggsock#1

@ggerganov
Copy link
Owner

Merged. After we revert the submodule link change we can merge

@guilt guilt force-pushed the master branch 4 times, most recently from 571a102 to bfc12d1 Compare July 21, 2023 23:52
@guilt
Copy link
Contributor Author

guilt commented Jul 21, 2023

@ggerganov I have made the relevant changes. Please check. I have also updated the comments above on the PR.

@ggerganov ggerganov merged commit 614bcb3 into ggerganov:master Jul 22, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants