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.

Sign up for GitHub

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

Fix broken windows build #3684

Merged
merged 6 commits into from
Dec 2, 2024
Merged

Fix broken windows build #3684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2dcfca1
test
sgpearse Nov 18, 2024
9f67d7d
test
sgpearse Nov 18, 2024
c598e02
test
sgpearse Nov 18, 2024
4639b1e
test
sgpearse Nov 19, 2024
d3dc601
revert windows build test
sgpearse Nov 19, 2024
0ff592e
test
sgpearse Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -651,7 +651,7 @@ workflows:
#- build_python_api_ubuntuDebug
#- build_python_api_ubuntu
#- build_python_api_osx
# - build_win10_installer
- build_win10_installer
# - build_macOS_installers
# - build_appleSilicon_installer
# - build_macOSx86_installer
Expand Down
5 changes: 3 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,9 @@ set (VERSION_STRING_FULL ${VERSION_STRING}.${VERSION_COMMIT})
if (APPLE)
add_definitions (-DDarwin)
elseif (WIN32)
add_definitions (-DWIN32 -DNOMINMAX)
add_definitions (-DGLAD_API_CALL_EXPORT)
add_definitions (-DWIN32 -DNOMINMAX)
add_definitions (-DGLAD_API_CALL_EXPORT)
add_compile_definitions(_HAS_STD_BYTE=0)
endif()

# compiler warning flags
Expand Down
7 changes: 6 additions & 1 deletion apps/vaporgui/CLIToolInstaller.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@
#include <common.h>
#include <vapor/ResourcePath.h>

#ifdef WIN32
#include "windowsUtils.h"
#endif

using namespace std;
using namespace Wasp;

void CLIToolInstaller::Install()
Expand Down Expand Up @@ -99,4 +104,4 @@ void CLIToolInstaller::Install()
#endif

box.exec();
}
}
3 changes: 2 additions & 1 deletion apps/vaporgui/windowsUtils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

#include <Windows.h>

#define WIN32_LEAN_AND_MEAN
#define WINDOWS_SUCCESS ERROR_SUCCESS
#define WINDOWS_ERROR_FILE_NOT_FOUND ERROR_FILE_NOT_FOUND
#define WINDOWS_HKEY_CLASSES_ROOT HKEY_CLASSES_ROOT
Expand All @@ -19,4 +20,4 @@ LONG Windows_SetRegistryString(HKEY hKey, const std::string &strValueName
std::string Windows_GetErrorString(LONG errorCode);

#endif
#endif
#endif