[dia] [clang-cl] libs after LDFLAGS

[Hans Breuer <hans src gnome org>]

commit 1762e171d81c261dfe3a532b3cd3c0a8bcba8aaf
Author: Hans Breuer <hans breuer org>
Date:   Sun Dec 15 21:28:36 2013 +0100

    [clang-cl] libs after LDFLAGS

 app/makefile.msc      |   14 +++++++-------
 lib/makefile.msc      |    2 +-
 objects/makefile.msc  |    3 ++-
 plug-ins/makefile.msc |    4 ++--
 4 files changed, 12 insertions(+), 11 deletions(-)
---
diff --git a/app/makefile.msc b/app/makefile.msc
index 84f5281..50d5c0d 100644
--- a/app/makefile.msc
+++ b/app/makefile.msc
@@ -138,17 +138,17 @@ $(PACKAGE).lib : $(OBJECTS)
        lib /out:$(PACKAGE).lib $(OBJECTS)
 
 $(PACKAGE)-app.dll : $(OBJECTS) $(PACKAGE).def
-       $(CC) $(CFLAGS) -LD -Fe$(PACKAGE)-app.dll $(OBJECTS) $(PKG_LINK) \
-       gdi32.lib user32.lib advapi32.lib shell32.lib wsock32.lib $(LDFLAGS) /def:$(PACKAGE).def
+       $(CC) $(CFLAGS) -LD -Fe$(PACKAGE)-app.dll $(OBJECTS) \
+       $(LDFLAGS) $(PKG_LINK) gdi32.lib user32.lib advapi32.lib shell32.lib wsock32.lib /def:$(PACKAGE).def
 
 $(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res main.obj $(PACKAGE)-app.dll
-       $(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res main.obj dia-app.lib $(PKG_LINK) \
-       user32.lib advapi32.lib $(LDFLAGS) /subsystem:console
+       $(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res main.obj \
+       $(LDFLAGS) dia-app.lib $(PKG_LINK) user32.lib advapi32.lib /subsystem:console
 
 $(PACKAGE)w.exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res winmain.obj $(PACKAGE)-app.dll
-       $(CC) $(CFLAGS) -Fe$(PACKAGE)w.exe $(PACKAGE).res winmain.obj dia-app.lib $(PKG_LINK) \
-       gdi32.lib comdlg32.lib user32.lib advapi32.lib $(LDFLAGS) /subsystem:windows
-       
+       $(CC) $(CFLAGS) -Fe$(PACKAGE)w.exe $(PACKAGE).res winmain.obj \
+       $(LDFLAGS) dia-app.lib $(PKG_LINK) gdi32.lib comdlg32.lib user32.lib advapi32.lib $(LDFLAGS) 
/subsystem:windows
+
 $(PACKAGE)-win-remote.exe : dia-win-remote.c dia-win-remote.obj
        $(CC) $(CFLAGS) -Fedia-win-remote.exe $(PACKAGE).res dia-win-remote.obj \
        $(LDFLAGS) $(GLIB_LIBS) gdi32.lib comdlg32.lib user32.lib advapi32.lib shell32.lib \
diff --git a/lib/makefile.msc b/lib/makefile.msc
index bd2451a..0f9a120 100644
--- a/lib/makefile.msc
+++ b/lib/makefile.msc
@@ -171,7 +171,7 @@ $(PACKAGE).lib : $(OBJECTS)
 
 $(PACKAGE).dll : $(OBJECTS) $(PACKAGE).def
        $(CC) $(CFLAGS) -LD -Fe$(PACKAGE).dll $(OBJECTS) \
-       $(PKG_LINK) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:$(PACKAGE).def
+       $(LDFLAGS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib /def:$(PACKAGE).def
 
 $(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32
        copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h
diff --git a/objects/makefile.msc b/objects/makefile.msc
index 88722ed..6238aab 100644
--- a/objects/makefile.msc
+++ b/objects/makefile.msc
@@ -345,7 +345,8 @@ $(PACKAGE).lib : $(OBJECTS)
        lib /out:$(PACKAGE).lib $(OBJECTS)
 
 $(PACKAGE).dll : $(OBJECTS) $(PKG_DEF)
-       $(CC) $(CFLAGS) -LD -Fe$(PACKAGE).dll $(OBJECTS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib 
$(LDFLAGS) /def:$(PKG_DEF)
+       $(CC) $(CFLAGS) -LD -Fe$(PACKAGE).dll $(OBJECTS) \
+       $(LDFLAGS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib /def:$(PKG_DEF)
 
 $(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32
        copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h
diff --git a/plug-ins/makefile.msc b/plug-ins/makefile.msc
index 45b48e8..e9e4842 100644
--- a/plug-ins/makefile.msc
+++ b/plug-ins/makefile.msc
@@ -110,7 +110,7 @@ OBJECTS = \
 !ENDIF
 
 !IFDEF OBJ_pdf
-DEPCFLAGS = -DWIN32 $(POPPLER_CFLAGS) -GX -GR -EHs
+DEPCFLAGS = -DWIN32 -DHAVE_POPPLER=1 $(POPPLER_CFLAGS) -GX -GR -EHs
 EXTRALIBS = $(POPPLER_LIBS) $(JPEG_LIBS)
 OBJECTS = \
   pdf.obj \
@@ -208,7 +208,7 @@ $(PACKAGE).lib : $(OBJECTS)
 
 $(PACKAGE).dll : $(OBJECTS) $(PKG_DEF) $(EXTRALIBS)
        $(CC) $(CFLAGS) -LD -Fe$(PACKAGE).dll $(OBJECTS) \
-       $(PKG_LINK) $(EXTRALIBS) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:$(PKG_DEF)
+       $(LDFLAGS) $(PKG_LINK) $(EXTRALIBS) user32.lib advapi32.lib wsock32.lib /def:$(PKG_DEF)
 $(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32
        copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h
 .cpp.obj :