From 40bebd3aa314bb78a3e359264ad6abd93fbb85e5 Mon Sep 17 00:00:00 2001 From: Robin Watts Date: Thu, 3 Nov 2016 12:43:59 +0000 Subject: MSVS: Add libluratech to project. This will only be built in "DebugCommercial" "ReleaseCommercial" and "MementoCommercial" configuration builds. A note on the way MSVS solutions work; libluratech is listed as a dependency of the executables - this applies to ALL configurations. In order to stop normal builds failing when we have no source, we set each non "Commercial" configuration to not build libluratech. The linker still looks for the output from the libluratech stage to link in though, so for all non "Commercial" configurations, we have the libluratech stage set to produce output named " ". This is copied into the linker command line, and all is happy. The sole downside to this is that if we try to build libluratech in "Debug" (say) rather than "DebugCommercial", the build will fail at the library making step. This will never happen unless we manually try to build that project in that configuration though. --- platform/win32/generated.vcproj | 63 -- platform/win32/libfonts.vcproj | 244 ----- platform/win32/libluratech.vcproj | 2023 +++++++++++++++++++++++++++++++++++ platform/win32/libmupdf.vcproj | 382 ++++++- platform/win32/libthirdparty.vcproj | 8 +- platform/win32/mudraw.vcproj | 443 +++++++- platform/win32/mujstest.vcproj | 441 ++++++++ platform/win32/mupdf-curl.vcproj | 447 ++++++++ platform/win32/mupdf-gl.vcproj | 477 ++++++++- platform/win32/mupdf.sln | 258 ++++- platform/win32/mupdf.vcproj | 443 +++++++- platform/win32/muraster.vcproj | 441 ++++++++ platform/win32/mutool.vcproj | 443 +++++++- 13 files changed, 5765 insertions(+), 348 deletions(-) create mode 100644 platform/win32/libluratech.vcproj (limited to 'platform/win32') diff --git a/platform/win32/generated.vcproj b/platform/win32/generated.vcproj index 0960361b..575c8153 100644 --- a/platform/win32/generated.vcproj +++ b/platform/win32/generated.vcproj @@ -11,9 +11,6 @@ - @@ -38,26 +35,6 @@ CompileAsManaged="" /> - - - - - - - - - diff --git a/platform/win32/libfonts.vcproj b/platform/win32/libfonts.vcproj index bd9f9c12..b15dfaac 100644 --- a/platform/win32/libfonts.vcproj +++ b/platform/win32/libfonts.vcproj @@ -384,250 +384,6 @@ Name="VCPostBuildEventTool" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/platform/win32/libluratech.vcproj b/platform/win32/libluratech.vcproj new file mode 100644 index 00000000..ac331617 --- /dev/null +++ b/platform/win32/libluratech.vcproj @@ -0,0 +1,2023 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/platform/win32/libmupdf.vcproj b/platform/win32/libmupdf.vcproj index b541347a..e1e01f7f 100644 --- a/platform/win32/libmupdf.vcproj +++ b/platform/win32/libmupdf.vcproj @@ -737,7 +737,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\jpeg;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\mujs;..\..\thirdparty\harfbuzz\src" - PreprocessorDefinitions="FZ_LARGEFILE;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="FZ_LARGEFILE;DEBUG=1;USE_OUTPUT_DEBUG_STRING;FZ_ENABLE_GPRF=1" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -1025,6 +1025,386 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/platform/win32/libthirdparty.vcproj b/platform/win32/libthirdparty.vcproj index 9b618605..839f4023 100644 --- a/platform/win32/libthirdparty.vcproj +++ b/platform/win32/libthirdparty.vcproj @@ -391,7 +391,7 @@ @@ -452,7 +452,7 @@ @@ -514,7 +514,7 @@ @@ -603,6 +603,447 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/platform/win32/mujstest.vcproj b/platform/win32/mujstest.vcproj index 6dcfa763..e8872d7e 100644 --- a/platform/win32/mujstest.vcproj +++ b/platform/win32/mujstest.vcproj @@ -756,6 +756,447 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/platform/win32/mupdf-curl.vcproj b/platform/win32/mupdf-curl.vcproj index d1e3402b..c63c5136 100644 --- a/platform/win32/mupdf-curl.vcproj +++ b/platform/win32/mupdf-curl.vcproj @@ -768,6 +768,453 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/platform/win32/mupdf-gl.vcproj b/platform/win32/mupdf-gl.vcproj index 649b951e..fbfbc5d0 100644 --- a/platform/win32/mupdf-gl.vcproj +++ b/platform/win32/mupdf-gl.vcproj @@ -20,8 +20,8 @@ @@ -97,7 +97,7 @@ @@ -252,6 +252,8 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -907,6 +1197,157 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/platform/win32/muraster.vcproj b/platform/win32/muraster.vcproj index 1d9b312e..8e40e54e 100644 --- a/platform/win32/muraster.vcproj +++ b/platform/win32/muraster.vcproj @@ -458,6 +458,447 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/platform/win32/mutool.vcproj b/platform/win32/mutool.vcproj index 09547a07..5646725d 100644 --- a/platform/win32/mutool.vcproj +++ b/platform/win32/mutool.vcproj @@ -533,7 +533,303 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -603,6 +899,151 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3