diff options
| author | Tor Andersson <tor.andersson@artifex.com> | 2015-10-14 12:05:56 +0200 |
|---|---|---|
| committer | Tor Andersson <tor.andersson@artifex.com> | 2015-10-14 13:40:23 +0200 |
| commit | 351b733adbb7cd50d232f3a4af9daa780d8dce51 (patch) | |
| tree | ff74690eb4b8307336394692bfa1ab3ce89aaedb /platform | |
| parent | 7a9dc98ae97bc88e64e20d0710e7d18ceb972055 (diff) | |
| download | mupdf-351b733adbb7cd50d232f3a4af9daa780d8dce51.tar.xz | |
gl: Fix win32 release mode build.
Always build with the 'windows' subsystem and use WinMain.
Turn on USE_OUTPUT_DEBUG_STRING to capture fz_warn and fz_throw error messages.
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/gl/gl-main.c | 4 | ||||
| -rw-r--r-- | platform/win32/mupdf-gl.vcproj | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/platform/gl/gl-main.c b/platform/gl/gl-main.c index b2cf30c4..500fec0c 100644 --- a/platform/gl/gl-main.c +++ b/platform/gl/gl-main.c @@ -1409,8 +1409,10 @@ int main(int argc, char **argv) } #ifdef _MSC_VER -int wmain(int argc, wchar_t *wargv[]) +int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nShowCmd) { + int argc; + LPWSTR *wargv = CommandLineToArgvW(GetCommandLineW(), &argc); char **argv = fz_argv_from_wargv(argc, wargv); int ret = main_utf8(argc, argv); fz_free_argv(argc, argv); diff --git a/platform/win32/mupdf-gl.vcproj b/platform/win32/mupdf-gl.vcproj index 062dd2d2..afb67865 100644 --- a/platform/win32/mupdf-gl.vcproj +++ b/platform/win32/mupdf-gl.vcproj @@ -41,7 +41,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include;..\..\thirdparty\glfw\include;..\..\scripts\freetype;..\..\thirdparty\freetype\include" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;USE_OUTPUT_DEBUG_STRING" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -64,7 +64,7 @@ AdditionalOptions="opengl32.lib" LinkIncremental="0" GenerateDebugInformation="true" - SubSystem="1" + SubSystem="2" TargetMachine="1" /> <Tool |