diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2012-10-31 17:12:33 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-10-31 17:20:22 +0200 |
| commit | 0f2976e8fb65dd8685b51d3fa1cf2a7b6f001d5d (patch) | |
| tree | 20b58fca311849790ec5b13c2db60ea75391853d | |
| parent | 075e9ca0b96f37b3561824c23af60872d6a9d80a (diff) | |
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
| -rw-r--r-- | gdk-pixbuf/makefile.mk | 2 | ||||
| -rw-r--r-- | glib/makefile.mk | 2 | ||||
| -rw-r--r-- | pango/makefile.mk | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/gdk-pixbuf/makefile.mk b/gdk-pixbuf/makefile.mk index c2709ec6769c..dec7ea4aa6ee 100644 --- a/gdk-pixbuf/makefile.mk +++ b/gdk-pixbuf/makefile.mk @@ -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 diff --git a/glib/makefile.mk b/glib/makefile.mk index b81cc53d3547..eb9a72a3307c 100644 --- a/glib/makefile.mk +++ b/glib/makefile.mk @@ -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 diff --git a/pango/makefile.mk b/pango/makefile.mk index 2fb2db860288..1815b6c1d773 100644 --- a/pango/makefile.mk +++ b/pango/makefile.mk @@ -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 |