diff options
| author | Robin Watts <robin.watts@artifex.com> | 2015-06-02 11:02:59 +0100 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2015-06-02 11:12:22 +0100 |
| commit | e513c5587954b85e29fd3c35207afab94c1b024f (patch) | |
| tree | 2c0c29681d0a4536c599971409e61463a9f898c7 | |
| parent | 274f92661e7c595185768a5c3cdd7c030bd84bb4 (diff) | |
| download | mupdf-e513c5587954b85e29fd3c35207afab94c1b024f.tar.xz | |
Ensure that we can still build mudraw standalone if we want to.
MUDRAW_STANDALONE forces mudraw_main to be just main. Set this
in the mudraw VS project.
| -rw-r--r-- | platform/win32/mudraw.vcproj | 5 | ||||
| -rw-r--r-- | source/tools/mudraw.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/platform/win32/mudraw.vcproj b/platform/win32/mudraw.vcproj index 6707469e..272e76ed 100644 --- a/platform/win32/mudraw.vcproj +++ b/platform/win32/mudraw.vcproj @@ -43,7 +43,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="MUDRAW_STANDALONE;DEBUG=1;USE_OUTPUT_DEBUG_STRING" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -190,6 +190,7 @@ Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="..\..\include" + PreprocessorDefinitions="MUDRAW_STANDALONE" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -337,7 +338,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include" - PreprocessorDefinitions="MEMENTO=1;DEBUG=1;USE_OUTPUT_DEBUG_STRING" + PreprocessorDefinitions="MUDRAW_STANDALONE;MEMENTO=1;DEBUG=1;USE_OUTPUT_DEBUG_STRING" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" diff --git a/source/tools/mudraw.c b/source/tools/mudraw.c index 4483ad43..509e59b2 100644 --- a/source/tools/mudraw.c +++ b/source/tools/mudraw.c @@ -846,7 +846,11 @@ trace_realloc(void *arg, void *p_, unsigned int size) return &p[1]; } +#ifdef MUDRAW_STANDALONE +int main(int argc, char **argv) +#else int mudraw_main(int argc, char **argv) +#endif { char *password = ""; fz_document *doc = NULL; |