Kaydet (Commit) 0f2976e8 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Don't let a DEBUG env var pollute the GLib nmake build mechanism

LO builds GLib, gdk-pixbuf and Pango using their ancient nmake-based
build mechanisms (that use the make.msc from GLib's build/win32
directory). This compiles against the debugging runtime (the -MDd
switch, msvcr90d.dll) if there is a DEBUG environment variable. We
don't want that. None of LO's own DLLs should use the debugging
runtime even in an --enable-debug build, and the debugging runtime
doesn't get included in the installer.

Change-Id: I04d2dcc0d5bb245af4afac976b6c1fecbf2095e1
üst 075e9ca0
......@@ -99,7 +99,7 @@ ADDITIONAL_FILES=config.h.win32 glib-mkenums.pl msvc_recommended_pragmas.h
CONFIGURE_DIR=
CONFIGURE_ACTION=
BUILD_DIR=./gdk-pixbuf
BUILD_ACTION=nmake -f makefile.msc
BUILD_ACTION=unset debug; nmake -f makefile.msc
OUT2LIB+=gdk-pixbuf/gdk_pixbuf-2.0.lib
......
......@@ -140,7 +140,7 @@ ADDITIONAL_FILES= config.h \
gmodule/gmoduleconf.h \
gobject/glib-mkenums
BUILD_ACTION=nmake -f makefile.msc
BUILD_ACTION=unset debug; nmake -f makefile.msc
OUT2BIN+=gio$/giolo.dll
OUT2BIN+=glib$/gliblo.dll
......
......@@ -121,7 +121,7 @@ ADDITIONAL_FILES=config.h msvc_recommended_pragmas.h
CONFIGURE_DIR=
CONFIGURE_ACTION=
BUILD_DIR=./pango
BUILD_ACTION=nmake -f makefile.msc
BUILD_ACTION=unset debug; nmake -f makefile.msc
OUT2LIB+=pango/pango-1.0.lib
OUT2LIB+=pango/pangocairo-1.0.lib
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment