Adding mingw makefile changes.

Bug #134113 r=bryner
2003-03-08 05:57:15 +00:00 · 2003-03-08 05:57:15 +00:00 · d18d8ada60
--- a/config/static-config.mk
+++ b/config/static-config.mk
@ -94,14 +94,14 @@ STATIC_EXTRA_LIBS	+= $(MOZ_XINERAMA_LIBS)
 endif

 ifdef MOZ_CALENDAR
-STATIC_EXTRA_LIBS	+= -lmozical -lmozicalss
+STATIC_EXTRA_LIBS	+= $(call EXPAND_MOZLIBNAME,mozicalss mozical)
 endif

 # Component Makefile always brings in this.
 # STATIC_EXTRA_LIBS	+= $(TK_LIBS)

 ifeq ($(OS_ARCH),WINNT)
-STATIC_EXTRA_LIBS += comctl32.lib comdlg32.lib uuid.lib shell32.lib ole32.lib oleaut32.lib version.lib winspool.lib
+STATIC_EXTRA_LIBS += $(call EXPAND_LIBNAME,comctl32 comdlg32 uuid shell32 ole32 oleaut32 version winspool)
 endif


--- a/embedding/components/build/Makefile.in
+++ b/embedding/components/build/Makefile.in
@ -90,7 +90,7 @@ endif

 ifeq ($(MOZ_GFX_TOOLKIT),windows)
 LOCAL_INCLUDES += -I$(srcdir)/../printingui/src/win 
-OS_LIBS += winspool.lib comdlg32.lib
+OS_LIBS	+= $(call EXPAND_LIBNAME,winspool comdlg32)
 endif

 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
--- a/embedding/tests/Makefile.in
+++ b/embedding/tests/Makefile.in
@ -26,8 +26,10 @@ include $(DEPTH)/config/autoconf.mk

 DIRS = winEmbed

+ifndef GNU_CC
 ifndef NO_MFC
 DIRS += mfcembed/components mfcembed
 endif
+endif

 include $(topsrcdir)/config/rules.mk
--- a/embedding/tests/winEmbed/Makefile.in
+++ b/embedding/tests/winEmbed/Makefile.in
@ -70,12 +70,9 @@ LIBS		= \
 		$(MOZ_JS_LIBS) \
 		$(NULL)

-OS_LIBS		+= \
-		ole32.lib \
-		comdlg32.lib \
-		shell32.lib \
-		version.lib \
-		$(NULL)
+LOCAL_INCLUDES	= -I$(srcdir)
+
+OS_LIBS		+= $(call EXPAND_LIBNAME,ole32 comdlg32 shell32 version)

 #
 # Control the default heap size.
--- a/extensions/inspector/build/src/Makefile.in
+++ b/extensions/inspector/build/src/Makefile.in
@ -64,15 +64,18 @@ LOCAL_INCLUDES += -I$(srcdir)/../../base/src/win
 SHARED_LIBRARY_LIBS += \
 		$(DIST)/lib/$(LIB_PREFIX)inscreencap_s.$(LIB_SUFFIX) \
 		$(NULL)
+ifdef GNU_CC
+OS_LIBS		+= -lgdi32
+endif
 endif

 EXTRA_DSO_LDOPTS += \
 	$(LIBS_DIR) \
 	$(EXTRA_DSO_LIBS) \
+	$(MOZ_UNICHARUTIL_LIBS) \
 	$(MOZ_COMPONENT_LIBS) \
 	$(PNG_LIBS) \
 	$(ZLIB_LIBS) \
-	$(MOZ_UNICHARUTIL_LIBS) \
 	$(NULL)

 include $(topsrcdir)/config/rules.mk
--- a/extensions/wallet/build/Makefile.in
+++ b/extensions/wallet/build/Makefile.in
@ -54,7 +54,7 @@ EXTRA_DSO_LDOPTS = \
 		$(NULL)

 ifeq ($(OS_ARCH),WINNT)
-OS_LIBS		+= shell32.lib
+OS_LIBS		+= $(call EXPAND_LIBNAME,shell32)
 endif

 include $(topsrcdir)/config/rules.mk
--- a/gfx/src/windows/Makefile.in
+++ b/gfx/src/windows/Makefile.in
@ -80,7 +80,11 @@ LOCAL_INCLUDES	= \
 		-I$(srcdir)/../shared \
 		$(NULL)

-OS_LIBS		+= winspool.lib comdlg32.lib
+_OS_LIBS	= winspool comdlg32
+ifdef GNU_CC
+_OS_LIBS	+= gdi32
+endif
+OS_LIBS		+= $(call EXPAND_LIBNAME,$(_OS_LIBS))

 GARBAGE		+= nsCompressedCharMap.cpp

@ -106,9 +110,10 @@ install:: fontEncoding.properties
 DEFINES	+= -DSTRICT 

 EXTRA_DSO_LDOPTS += \
+		$(LIBS_DIR) \
 		$(EXTRA_DSO_LIBS) \
-		$(MOZ_COMPONENT_LIBS) \
 		$(MOZ_UNICHARUTIL_LIBS) \
+		$(MOZ_COMPONENT_LIBS) \
 		$(MOZ_JS_LIBS) \
 		$(NULL)

@ -119,7 +124,7 @@ LOCAL_INCLUDES += -I$(NGLAYOUT_DDRAW)/include
 else
 LOCAL_INCLUDES += -I$(NGLAYOUT_DDRAW)/inc
 endif
-EXTRA_DSO_LDOPTS += $(NGLAYOUT_DDRAW/lib/ddraw.lib
+EXTRA_DSO_LDOPTS += $(NGLAYOUT_DDRAW)/lib/ddraw.lib
 OS_LIBS	+= ole32.lib
 endif

--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@ -240,7 +240,7 @@ LDFLAGS		+= -lm
 endif

 # Prevent floating point errors caused by VC++ optimizations
-ifeq ($(OS_ARCH),WINNT)
+ifeq ($(OS_ARCH)_$(GNU_CC),WINNT_)
 CFLAGS += /Op
 endif # WINNT

--- a/mailnews/Makefile.in
+++ b/mailnews/Makefile.in
@ -29,8 +29,10 @@ include $(DEPTH)/config/autoconf.mk
 DIRS		= public base db/msgdb news local mime compose imap addrbook import extensions

 ifeq ($(OS_ARCH),WINNT)
+ifndef GNU_CC
 DIRS		+= mapi
 endif
+endif

 include $(topsrcdir)/config/rules.mk

--- a/mailnews/addrbook/src/Makefile.in
+++ b/mailnews/addrbook/src/Makefile.in
@ -112,6 +112,7 @@ EXPORTS		= \
 		$(NULL)

 ifeq ($(OS_ARCH),WINNT)
+ifndef GNU_CC
 EXPORTS		+= \
 		nsAbOutlookCard.h \
 		nsAbOutlookDirFactory.h \
@ -128,6 +129,7 @@ CPPSRCS		+= \
 		$(NULL)

 endif
+endif

 ifdef MOZ_LDAP_XPCOM
 REQUIRES    += mozldap \
--- a/mailnews/base/build/Makefile.in
+++ b/mailnews/base/build/Makefile.in
@ -85,15 +85,15 @@ EXTRA_DSO_LDOPTS = \
 		$(LIBS_DIR)	\
 		$(EXTRA_DSO_LIBS) \
 		$(MOZ_JS_LIBS) \
-		$(MOZ_COMPONENT_LIBS) \
 		$(MOZ_UNICHARUTIL_LIBS) \
+		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)

-LOCAL_INCLUDES = -I$(srcdir)/../src
+LOCAL_INCLUDES = -I$(srcdir) -I$(srcdir)/../src

 include $(topsrcdir)/config/rules.mk

 ifeq ($(OS_ARCH),WINNT)
-OS_LIBS	+= shell32.lib
+OS_LIBS	+= $(call EXPAND_LIBNAME,shell32)
 endif

--- a/mailnews/import/Makefile.in
+++ b/mailnews/import/Makefile.in
@ -31,9 +31,11 @@ DIRS		= public src text comm4x
 ifeq ($(OS_ARCH),WINNT)
 DIRS		+= eudora
 ifneq ($(_MSC_VER),1100)
+ifndef GNU_CC
 DIRS		+= oexpress outlook
 endif
 endif
+endif

 include $(topsrcdir)/config/rules.mk

--- a/modules/libpr0n/decoders/icon/Makefile.in
+++ b/modules/libpr0n/decoders/icon/Makefile.in
@ -70,7 +70,7 @@ EXTRA_DSO_LDOPTS = \
 LOCAL_INCLUDES	= -I$(srcdir)/$(PLATFORM)

 ifeq ($(OS_ARCH),WINNT)
-OS_LIBS		+= shell32.lib
+OS_LIBS		+= $(call EXPAND_LIBNAME,shell32 gdi32)
 endif

 include $(topsrcdir)/config/rules.mk
--- a/modules/plugin/base/src/Makefile.in
+++ b/modules/plugin/base/src/Makefile.in
@ -119,8 +119,12 @@ endif
 include $(topsrcdir)/config/rules.mk

 ifeq ($(OS_ARCH),WINNT)
+ifdef GNU_CC
+CXXFLAGS	+= -fexceptions
+else
 CXXFLAGS	+= -GX
-OS_LIBS		+= version.lib
+endif
+OS_LIBS		+= $(call EXPAND_LIBNAME,version)
 endif

 ifeq ($(OS_ARCH), OpenVMS)
--- a/modules/plugin/samples/default/windows/Makefile.in
+++ b/modules/plugin/samples/default/windows/Makefile.in
@ -47,6 +47,8 @@ CPPSRCS		= \
 		utils.cpp \
 		$(NULL)

+LOCAL_INCLUDES	= -I$(srcdir)
+
 # plugins should always be shared, even in the "static" build
 FORCE_SHARED_LIB = 1

@ -58,8 +60,14 @@ NO_INSTALL = 1

 include $(topsrcdir)/config/rules.mk

+_OS_LIBS	= version
+ifdef GNU_CC
+CXXFLAGS	+= -fexceptions
+_OS_LIBS	+= gdi32
+else
 CXXFLAGS	+= -GX
-OS_LIBS		+= version.lib
+endif
+OS_LIBS		+= $(call EXPAND_LIBNAME,$(_OS_LIBS))

 install-plugin: $(SHARED_LIBRARY)
 ifdef SHARED_LIBRARY
--- a/modules/plugin/tools/sdk/samples/basic/windows/Makefile.in
+++ b/modules/plugin/tools/sdk/samples/basic/windows/Makefile.in
@ -36,11 +36,15 @@ REQUIRES = plugin \

 CPPSRCS = plugin.cpp

-SHARED_LIBRARY_LIBS = ../../common/plugingate_s.$(LIB_SUFFIX)
+SHARED_LIBRARY_LIBS = ../../common/$(LIB_PREFIX)plugingate_s.$(LIB_SUFFIX)

 DEFFILE = $(srcdir)/basic.def
 RESFILE = basic.res

+ifdef GNU_CC
+OS_LIBS	+= -lgdi32
+endif
+
 include $(topsrcdir)/config/rules.mk

 DEFINES += -DMOZILLA_STRICT_API
--- a/modules/plugin/tools/sdk/samples/scriptable/windows/Makefile.in
+++ b/modules/plugin/tools/sdk/samples/scriptable/windows/Makefile.in
@ -41,11 +41,15 @@ CPPSRCS = plugin.cpp \

 XPIDLSRCS = nsIScriptablePluginSample.idl

-SHARED_LIBRARY_LIBS = ../../common/plugingate_s.$(LIB_SUFFIX)
+SHARED_LIBRARY_LIBS = ../../common/$(LIB_PREFIX)plugingate_s.$(LIB_SUFFIX)

 DEFFILE = $(srcdir)/npscriptable.def
 RESFILE = npscriptable.res

+ifdef GNU_CC
+OS_LIBS	+= -lgdi32
+endif
+
 include $(topsrcdir)/config/rules.mk

 DEFINES += -DMOZILLA_STRICT_API
--- a/modules/plugin/tools/sdk/samples/winless/windows/Makefile.in
+++ b/modules/plugin/tools/sdk/samples/winless/windows/Makefile.in
@ -36,7 +36,7 @@ REQUIRES = plugin \

 CPPSRCS = plugin.cpp

-SHARED_LIBRARY_LIBS = ../../common/plugingate_s.$(LIB_SUFFIX)
+SHARED_LIBRARY_LIBS = ../../common/$(LIB_PREFIX)plugingate_s.$(LIB_SUFFIX)

 DEFFILE = $(srcdir)/npwinless.def
 RESFILE = npwinless.res
--- a/modules/zlib/src/Makefile.in
+++ b/modules/zlib/src/Makefile.in
@ -32,8 +32,10 @@ LIBRARY_NAME	= mozz
 GRE_MODULE	= 1

 ifeq ($(OS_ARCH),WINNT)
+ifndef GNU_CC
 MAPFILE	= $(LIBRARY_NAME).map
 DEFFILE	= $(srcdir)/zlib.def
+endif
 DEFINES	+= -DZLIB_DLL=1
 endif

--- a/netwerk/base/src/Makefile.in
+++ b/netwerk/base/src/Makefile.in
@ -75,7 +75,9 @@ else
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 	CPPSRCS += nsURLHelperWin.cpp
 	CPPSRCS += nsNativeConnectionHelper.cpp
+ifndef GNU_CC
 	CPPSRCS += nsAutodialWin.cpp
+endif
 else
 	CPPSRCS += nsURLHelperUnix.cpp
 endif
--- a/netwerk/build/Makefile.in
+++ b/netwerk/build/Makefile.in
@ -103,3 +103,9 @@ endif

 include $(topsrcdir)/config/rules.mk

+ifeq ($(OS_ARCH),WINNT)
+ifdef GNU_CC
+OS_LIBS		+= -lws2_32
+endif
+endif
+
--- a/uriloader/build/Makefile.in
+++ b/uriloader/build/Makefile.in
@ -1,84 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1999 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#
-
-DEPTH		= ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= uriloader
-LIBRARY_NAME	= uriloader
-EXPORT_LIBRARY = 1
-SHORT_LIBNAME	= urildr
-IS_COMPONENT	= 1
-MODULE_NAME	= nsURILoaderModule
-GRE_MODULE	= 1
-
-REQUIRES	= xpcom \
-		  string \
-		  necko \
-		  mimetype \
-		  exthandler \
-		  prefetch \
-		  rdf \
-		  helperAppDlg \
-		  dom \
-		  uconv \
-		  htmlparser \
-		  $(NULL)
-
-CPPSRCS		= nsURILoaderModule.cpp
-
-SHARED_LIBRARY_LIBS = \
-		$(DIST)/lib/$(LIB_PREFIX)uriloaderbase_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/$(LIB_PREFIX)exthandler_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/$(LIB_PREFIX)prefetch_s.$(LIB_SUFFIX) \
-		$(NULL)
-
-LOCAL_INCLUDES	= \
-		-I$(srcdir)/../prefetch \
-		$(NULL)
-
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
-LOCAL_INCLUDES += -I$(srcdir)/../exthandler/mac
-endif
-
-EXTRA_DSO_LDOPTS = \
-		$(LIBS_DIR) \
-		$(MOZ_UNICHARUTIL_LIBS) \
-		$(MOZ_COMPONENT_LIBS) \
-		$(MOZ_JS_LIBS) \
-		$(NULL)
-
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
-EXTRA_DSO_LDOPTS += \
-        $(TK_LIBS) \
-        $(NULL)
-endif
-
-ifeq ($(OS_ARCH),WINNT)
-OS_LIBS		+= shell32.lib
-endif
-
-include $(topsrcdir)/config/rules.mk
-
--- a/xpcom/build/Makefile.in
+++ b/xpcom/build/Makefile.in
@ -141,9 +141,9 @@ EXTRA_DSO_LDOPTS += -lbe
 endif

 ifeq ($(OS_ARCH),WINNT)
-EXTRA_DSO_LDOPTS += shell32.lib ole32.lib
+EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME,shell32 ole32 uuid)
 ifneq (,$(MOZ_DEBUG)$(NS_TRACE_MALLOC))
-EXTRA_DSO_LDOPTS += imagehlp.lib
+EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME,imagehlp)
 endif
 endif # WINNT

--- a/xpcom/tests/Makefile.in
+++ b/xpcom/tests/Makefile.in
@ -82,8 +82,12 @@ LOCAL_INCLUDES	= \
 		$(NULL)

 ifeq ($(OS_ARCH),WINNT)
+ifdef GNU_CXX
+CXXFLAGS	+= -fexceptions
+else
 CXXFLAGS	+= -GX
 endif
+endif

 libs::
 	$(INSTALL) $(srcdir)/test.properties $(DIST)/bin/res
--- a/xpcom/tests/windows/Makefile.in
+++ b/xpcom/tests/windows/Makefile.in
@ -39,6 +39,6 @@ include $(topsrcdir)/config/config.mk

 include $(topsrcdir)/config/rules.mk

-OS_LIBS = rpcrt4.lib uuid.lib
+OS_LIBS	= $(call EXPAND_LIBNAME,rpcrt4 uuid)

 LIBS = $(XPCOM_LIBS) $(NSPR_LIBS)
--- a/xpcom/tools/windows/Makefile.in
+++ b/xpcom/tools/windows/Makefile.in
@ -30,7 +30,7 @@ SIMPLE_PROGRAMS	= rebasedlls$(BIN_SUFFIX)

 CPPSRCS		= rebasedlls.cpp

-OS_LIBS		+= imagehlp.lib
+OS_LIBS		+= $(call EXPAND_LIBNAME,imagehlp)

 include $(topsrcdir)/config/rules.mk

--- a/xpcom/typelib/xpidl/Makefile.in
+++ b/xpcom/typelib/xpidl/Makefile.in
@ -58,10 +58,12 @@ CFLAGS		+= $(LIBIDL_CFLAGS)

 # Compile directly against the static lib, so we can use xpidl during the build
 # without the shared library path being set.
-ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
+ifeq (WINNT,$(OS_ARCH))
 DEFINES		+= -DEXPORT_XPT_API
+ifndef GNU_CC
 LDFLAGS		+= -SUBSYSTEM:CONSOLE -NODEFAULTLIB:MSVCRTD
 endif
+endif

 # Tell the $(PROGRAM) target that we need to be recompiled when libxpt changes.
 LIBS		= $(DIST)/lib/$(LIB_PREFIX)xpt.$(LIB_SUFFIX) $(LIBIDL_LIBS)
--- a/xpfe/bootstrap/Makefile.in
+++ b/xpfe/bootstrap/Makefile.in
@ -216,7 +216,7 @@ endif
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 RCINCLUDE = splash.rc
 CPPSRCS += nsNativeAppSupportWin.cpp nsNativeAppSupportBase.cpp
-OS_LIBS += comctl32.lib comdlg32.lib uuid.lib shell32.lib ole32.lib oleaut32.lib version.lib winspool.lib
+OS_LIBS	+= $(call EXPAND_LIBNAME,comctl32 comdlg32 uuid shell32 ole32 oleaut32 version winspool gdi32)
 endif

 ifneq (,$(filter windows os2 gtk gtk2,$(MOZ_WIDGET_TOOLKIT)))
@ -326,8 +326,10 @@ ifeq ($(OS_ARCH),WINNT)
 #
 # Set it to 256k.  See bug 127069.
 #
+ifndef GNU_CC
 LDFLAGS += /HEAP:0x40000
 endif
+endif

 CXXFLAGS	+= $(MOZ_TOOLKIT_REGISTRY_CFLAGS)

--- a/xpfe/components/build/Makefile.in
+++ b/xpfe/components/build/Makefile.in
@ -113,12 +113,13 @@ endif
 ifeq ($(OS_ARCH),WINNT)

 SHARED_LIBRARY_LIBS += \
-	$(DIST)/lib/$(LIB_PREFIX)urlwidgt_s.$(LIB_SUFFIX) \
 	$(DIST)/lib/$(LIB_PREFIX)winhooks_s.$(LIB_SUFFIX) \
-        $(DIST)/lib/$(LIB_PREFIX)alerts_s.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)urlwidgt_s.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)alerts_s.$(LIB_SUFFIX) \
 	$(NULL)

-OS_LIBS		+= ole32.lib shell32.lib
+
+OS_LIBS	+= $(call EXPAND_LIBNAME,ole32 shell32)

 LOCAL_INCLUDES	+= \
 	-I$(srcdir)/../urlwidget \
--- a/xpinstall/cleanup/Makefile.in
+++ b/xpinstall/cleanup/Makefile.in
@ -69,8 +69,10 @@ LDFLAGS += $(TK_LIBS)
 endif

 ifeq ($(OS_ARCH),WINNT)
+ifndef GNU_CC
 LDFLAGS += /SUBSYSTEM:WINDOWS
 endif
+endif

 libs::
 	$(INSTALL) $(srcdir)/cmessage.txt $(DIST)/bin/res
--- a/xpinstall/src/Makefile.in
+++ b/xpinstall/src/Makefile.in
@ -105,7 +105,7 @@ CPPSRCS		+= \
 		nsWinShortcut.cpp \
 		$(NULL)

-OS_LIBS		+= ole32.lib version.lib
+OS_LIBS		+= $(call EXPAND_LIBNAME,ole32 version uuid)
 endif	

 LOCAL_INCLUDES	= -I$(srcdir)/../public
--- a/xpinstall/wizard/windows/nsinstall/Makefile.in
+++ b/xpinstall/wizard/windows/nsinstall/Makefile.in
@ -36,6 +36,11 @@ CPPSRCS		= nsinstall.cpp

 LIBS		= $(EXTRA_DSO_LIBS)

+LOCAL_INCLUDES	= -I$(srcdir)
+ifdef GNU_CC
+OS_LIBS		+= -lgdi32
+endif
+
 NO_DIST_INSTALL	= 1

 include $(topsrcdir)/config/rules.mk
--- a/xpinstall/wizard/windows/nsztool/Makefile.in
+++ b/xpinstall/wizard/windows/nsztool/Makefile.in
@ -39,7 +39,9 @@ NO_DIST_INSTALL	= 1

 include $(topsrcdir)/config/rules.mk

+ifndef GNU_CC
 LDFLAGS		+= /SUBSYSTEM:WINDOWS /MACHINE:i386
+endif

 libs:: $(PROGRAM)
 	$(INSTALL) $(PROGRAM) $(DIST)/install
--- a/xpinstall/wizard/windows/setup/Makefile.in
+++ b/xpinstall/wizard/windows/setup/Makefile.in
@ -60,13 +60,17 @@ CPPSRCS		= \

 LIBS		= $(EXTRA_DSO_LIBS)

-LOCAL_INCLUDES	= -I$(srcdir)/../uninstall
+LOCAL_INCLUDES	= -I$(srcdir) -I$(srcdir)/../uninstall

 NO_DIST_INSTALL	= 1

 include $(topsrcdir)/config/rules.mk

-OS_LIBS		+= ole32.lib comdlg32.lib shell32.lib version.lib
+_OS_LIBS 	= ole32 comdlg32 shell32 version
+ifdef GNU_CC
+_OS_LIBS	+= gdi32 ws2_32 uuid
+endif
+OS_LIBS		+= $(call EXPAND_LIBNAME,$(_OS_LIBS))

 libs:: $(PROGRAM)
 	$(INSTALL) $(PROGRAM) $(DIST)/install
--- a/xpinstall/wizard/windows/uninstall/Makefile.in
+++ b/xpinstall/wizard/windows/uninstall/Makefile.in
@ -44,7 +44,13 @@ CSRCS		= \
 		rdi.c \
 		$(NULL)

+LOCAL_INCLUDES	= -I$(srcdir)
+
+ifdef GNU_CC
+OS_LIBS		+= -lshell32 -lversion -lgdi32
+else
 OS_LIBS		+= shell32.lib version.lib
+endif

 NO_DIST_INSTALL	= 1