2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 13:04:56 +00:00

Windows build fixes

This commit is contained in:
Jack Andersen
2019-07-27 15:21:31 -10:00
parent 5acf9ecbcf
commit 0ab08daae7
19 changed files with 55 additions and 43880 deletions

View File

@@ -13,7 +13,7 @@ else()
endif()
if(APPLE)
set(PLAT_SRCS MainMac.mm glew.c)
set(PLAT_SRCS MainMac.mm)
set_source_files_properties(MainMac.mm PROPERTIES COMPILE_FLAGS -fobjc-arc)
elseif(WIN32)
set(PLAT_SRCS MainWin.cpp)
@@ -32,6 +32,6 @@ if(APPLE)
set(PLAT_LIBS ${OPENGL_LIBRARY})
endif()
target_link_libraries(visigen logvisor athena-core zeus boo
target_link_libraries(visigen logvisor athena-core zeus glew
xxhash ${ZLIB_LIBRARIES} lzokay hecl-light ${PLAT_LIBS})
endif()

View File

@@ -8,11 +8,9 @@
#include <thread>
static logvisor::Module AthenaLog("Athena");
static void AthenaExc(athena::error::Level level, const char* file, const char*, int line, const char* fmt, ...) {
va_list ap;
va_start(ap, fmt);
AthenaLog.report(logvisor::Level(level), fmt, ap);
va_end(ap);
static void AthenaExc(athena::error::Level level, const char* /*file*/, const char*, int /*line*/,
fmt::string_view fmt, fmt::format_args args) {
AthenaLog.vreport(logvisor::Level(level), fmt, args);
}
static float s_Percent = 0.f;
@@ -125,11 +123,12 @@ int wmain(int argc, const hecl::SystemChar** argv) {
/* Quit message from client thread */
PostQuitMessage(0);
continue;
case WM_USER + 1:
case WM_USER + 1: {
/* Update window title from client thread */
std::wstring title = fmt::format(fmt(L"VISIGen [{:g}%]"), s_Percent * 100.f);
SetWindowTextW(window, title.c_str());
continue;
}
default:
break;
}

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff