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 /boilerplate | |
| 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 'boilerplate')
| -rw-r--r-- | boilerplate/Makefile.win32 | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/boilerplate/Makefile.win32 b/boilerplate/Makefile.win32 index 46aa0b6f..29df5cf7 100644 --- a/boilerplate/Makefile.win32 +++ b/boilerplate/Makefile.win32 @@ -2,8 +2,6 @@ top_srcdir = .. include $(top_srcdir)/build/Makefile.win32.common include Makefile.win32.features -CFLAGS += -I../src - HEADERS = \ $(enabled_cairo_boilerplate_headers) \ $(enabled_cairo_boilerplate_private) \ @@ -23,4 +21,4 @@ all: $(CFG)/boiler.lib $(CFG)/boiler.lib: $(OBJECTS) - lib -NOLOGO -OUT:$@ $(OBJECTS) $(WIN_LIBS) + @$(AR) $(CAIRO_ARFLAGS) -OUT:$@ $(OBJECTS) |