diff options
| author | Krzysztof Kowalczyk <kkowalczyk@gmail.com> | 2007-09-24 19:41:45 -0700 |
|---|---|---|
| committer | Krzysztof Kowalczyk <kkowalczyk@gmail.com> | 2007-09-24 19:41:45 -0700 |
| commit | 2f664b654ca19135f0f8a0fe89872b9e0d526fa2 (patch) | |
| tree | f17aa40d076d846c84d0af4f2265cfc1e19f7e2b | |
| parent | 05d41cd5aec39b4e3c8949445a9986e5ca8b50dd (diff) | |
Fix msvc debug build. Fix bitmap leak in perf-test.
| -rw-r--r-- | makefile.vc | 6 | ||||
| -rw-r--r-- | test/perf-test.cc | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/makefile.vc b/makefile.vc index feb613b1..25d42de0 100644 --- a/makefile.vc +++ b/makefile.vc @@ -60,7 +60,7 @@ CFLAGS = $(CFLAGS) /I$(ZLIB_DIR) /I$(JPEG_DIR) /I$(FREETYPE_DIR)\include LIBS = $(LIBS) kernel32.lib advapi32.lib user32.lib gdi32.lib
-LDFLAGS = $(LDFLAGS) /nologo /DEBUG /NODEFAULTLIB:libcmt
+LDFLAGS = $(LDFLAGS) /nologo /DEBUG
#CFLAGS = $(CFLAGS) /D "USE_FIXEDPOINT"
@@ -70,8 +70,10 @@ LDFLAGS = $(LDFLAGS) /nologo /DEBUG /NODEFAULTLIB:libcmt # /ltcg - link-time code generation. Generates smaller and faster code. Requires /GL when compiling.
LDFLAGS = $(LDFLAGS) /opt:ref /opt:icf /opt:nowin98 /ltcg
LIBS = $(LIBS) $(ZLIB_DIR)\zlib_s.lib $(JPEG_DIR)\jpeg_s.lib $(FREETYPE_DIR)\freetype231mt.lib
+LDFLAGS = $(LDFLAGS) /NODEFAULTLIB:libcmt
!else
-LIBS = $(LIBS) $(ZLIB_DIR)\zlib_sd.lib $(JPEG_DIR)\jpeg_sd.lib $(FREETYPE_DIR)\freetype231mt_d.lib
+LIBS = $(LIBS) $(ZLIB_DIR)\zlib_ds.lib $(JPEG_DIR)\jpeg_ds.lib $(FREETYPE_DIR)\freetype231mt_d.lib
+LDFLAGS = $(LDFLAGS) /NODEFAULTLIB:libcmtd
!endif
FOFI_OBJS=$(O)\FoFiBase.obj $(O)\FoFiEncodings.obj $(O)\FoFiTrueType.obj \
diff --git a/test/perf-test.cc b/test/perf-test.cc index d9030485..b9b5e118 100644 --- a/test/perf-test.cc +++ b/test/perf-test.cc @@ -903,6 +903,7 @@ static void RenderPdf(const char *fileName) if (gfSlowPreview)
sleep_milliseconds(SLOW_PREVIEW_TIME);
}
+ delete bmpSplash;
}
Error:
delete engineSplash;
|