diff options
| author | Andrea Canciani <ranma42@gmail.com> | 2011-06-18 17:06:52 +0200 |
|---|---|---|
| committer | Andrea Canciani <ranma42@gmail.com> | 2011-06-20 10:24:21 +0200 |
| commit | b6d593dc71e276576ce2af9fa2267eebdddd578a (patch) | |
| tree | f72d7c7d0da94920a8a61ae9f5ddec3eb6124d78 /build | |
| parent | 5534c305241e078c9a5745e511c0700545e045bb (diff) | |
build: Clean up environment variables and flags for the win32 build
Avoid ovverriding LINK, as it has a special meaning for the MSVC build
tools.
Diffstat (limited to 'build')
| -rw-r--r-- | build/Makefile.win32.common | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/build/Makefile.win32.common b/build/Makefile.win32.common index 5ff07809e..e42250063 100644 --- a/build/Makefile.win32.common +++ b/build/Makefile.win32.common @@ -11,16 +11,15 @@ top_builddir = $(top_srcdir) endif CC := cl -LINK := link +LD := link +AR := lib ifeq ($(CFG),debug) -MS_MDFLAGS := -MDd -MS_LDFLAGS := -LDd -OPT := -Od -Zi +CFG_CFLAGS := -MDd -Od -Zi +CFG_LDFLAGS := -DEBUG else -MS_MDFLAGS := -MD -MS_LDFLAGS := -LD -OPT := -MD -O2 +CFG_CFLAGS := -MD -O2 +CFG_LDFLAGS := endif PIXMAN_CFLAGS := -I$(top_srcdir)/../pixman/pixman @@ -37,13 +36,18 @@ ZLIB_CFLAGS += -I$(top_srcdir)/../zlib/ CAIRO_LIBS += $(top_builddir)/../zlib/zdll.lib endif -DEFAULT_CFLAGS = -nologo $(MS_MDFLAGS) $(OPT) -DEFAULT_CFLAGS += -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DEFAULT_CFLAGS += -I. -I$(top_srcdir) +DEFAULT_CFLAGS = -nologo $(CFG_CFLAGS) +DEFAULT_CFLAGS += -I. -I$(top_srcdir) -I$(top_srcdir)/src DEFAULT_CFLAGS += $(PIXMAN_CFLAGS) $(LIBPNG_CFLAGS) $(ZLIB_CFLAGS) CAIRO_CFLAGS = $(DEFAULT_CFLAGS) $(CFLAGS) +DEFAULT_LDFLAGS = -nologo $(CFG_LDFLAGS) +DEFAULT_ARFLAGS = -nologo + +CAIRO_LDFLAGS = $(DEFAULT_LDFLAGS) $(LDFLAGS) +CAIRO_ARFLAGS = $(DEFAULT_ARFLAGS) $(LDFLAGS) + inform: @echo ifneq ($(CFG),release) |