mirror of
https://github.com/WerWolv/ImHex.git
synced 2026-03-30 21:05:56 -05:00
build: Allow building and running on 32 bit Windows
This commit is contained in:
@@ -55,7 +55,19 @@
|
||||
"CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
|
||||
"VCPKG_MANIFEST_DIR": "${sourceDir}/dist"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "vs2022-x86",
|
||||
"displayName": "Visual Studio 2022 x86",
|
||||
"generator": "Visual Studio 17 2022",
|
||||
"binaryDir": "${sourceDir}/build/${presetName}",
|
||||
"cacheVariables": {
|
||||
"CMAKE_BUILD_TYPE": "Debug",
|
||||
"CMAKE_GENERATOR_PLATFORM": "Win32",
|
||||
"CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
|
||||
"VCPKG_MANIFEST_DIR": "${sourceDir}/dist"
|
||||
}
|
||||
}
|
||||
],
|
||||
"buildPresets": [
|
||||
{
|
||||
|
||||
@@ -1,11 +1,8 @@
|
||||
#pragma once
|
||||
|
||||
#if !defined(WINGDIAPI)
|
||||
#define WINGDIAPI extern "C"
|
||||
#endif
|
||||
|
||||
#if !defined(APIENTRY)
|
||||
#define APIENTRY
|
||||
#if defined(OS_WINDOWS)
|
||||
#include <Windows.h>
|
||||
#include <GL/GL.h>
|
||||
#endif
|
||||
|
||||
#if defined(OS_WEB)
|
||||
|
||||
@@ -120,9 +120,9 @@
|
||||
#endif
|
||||
|
||||
// IMHEX PATCH BEGIN
|
||||
#if !defined(WINGDIAPI)
|
||||
#define WINGDIAPI extern "C"
|
||||
#define APIENTRY
|
||||
#if defined(WIN32)
|
||||
#include <Windows.h>
|
||||
#include <GL/gl.h>
|
||||
#endif
|
||||
// IMHEX PATCH END
|
||||
|
||||
|
||||
@@ -77,7 +77,7 @@ namespace hex::plugin::builtin {
|
||||
}
|
||||
}
|
||||
ImGui::EndDisabled();
|
||||
ImGui::BeginDisabled(splitterTask.isRunning() || selectedItem != sizes.size() - 1);
|
||||
ImGui::BeginDisabled(splitterTask.isRunning() || selectedItem != (i64(sizes.size()) - 1));
|
||||
{
|
||||
ImGui::InputScalar("###custom_size", ImGuiDataType_U64, &splitSize);
|
||||
ImGui::SameLine();
|
||||
|
||||
Reference in New Issue
Block a user