From d5865f4067abc20e943a8cadd46eb64d3998f7e2 Mon Sep 17 00:00:00 2001 From: "cls%seawood.org" Date: Wed, 1 Jun 2005 14:28:35 +0000 Subject: [PATCH] Use dashes instead of backslashes for program options to avoid msys shell expansion. Thanks to Howard Chu for the patch. Bug #294122 r=cls a=shaver --- accessible/public/msaa/Makefile.in | 8 ++--- config/config.mk | 36 +++++++++---------- config/rules.mk | 24 ++++++------- configure | 28 +++++++-------- configure.in | 30 ++++++++-------- directory/c-sdk/build.mk | 18 +++++----- directory/c-sdk/config/Makefile.in | 4 +-- .../browser/activex/src/control/Makefile.in | 6 ++-- .../activex/src/control_kicker/Makefile.in | 6 ++-- embedding/tests/mfcembed/Makefile.in | 10 +++--- .../tests/mfcembed/components/Makefile.in | 6 ++-- js/src/Makefile.in | 6 ++-- nsprpub/config/Makefile.in | 2 +- nsprpub/lib/ds/Makefile.in | 2 +- nsprpub/lib/libc/src/Makefile.in | 2 +- nsprpub/lib/msgc/src/Makefile.in | 2 +- nsprpub/lib/prstreams/Makefile.in | 2 +- nsprpub/pr/src/Makefile.in | 2 +- nsprpub/pr/tests/dll/Makefile.in | 2 +- 19 files changed, 99 insertions(+), 97 deletions(-) diff --git a/accessible/public/msaa/Makefile.in b/accessible/public/msaa/Makefile.in index f719fa2db997..164cd332990d 100755 --- a/accessible/public/msaa/Makefile.in +++ b/accessible/public/msaa/Makefile.in @@ -95,9 +95,9 @@ OS_LIBS = \ $(MIDL_GENERATED_FILES): done_gen done_gen: ISimpleDOMNode.idl ISimpleDOMDocument.idl ISimpleDOMText.idl - $(MIDL) $(MIDL_FLAGS) /Oicf $(srcdir)/ISimpleDOMNode.idl - $(MIDL) $(MIDL_FLAGS) /Oicf $(srcdir)/ISimpleDOMDocument.idl - $(MIDL) $(MIDL_FLAGS) /Oicf $(srcdir)/ISimpleDOMText.idl + $(MIDL) $(MIDL_FLAGS) -Oicf $(srcdir)/ISimpleDOMNode.idl + $(MIDL) $(MIDL_FLAGS) -Oicf $(srcdir)/ISimpleDOMDocument.idl + $(MIDL) $(MIDL_FLAGS) -Oicf $(srcdir)/ISimpleDOMText.idl touch $@ EXPORTS = \ @@ -113,7 +113,7 @@ export:: done_gen # This marshall dll is also registered in the installer register:: - regsvr32 /s $(DIST)/bin/$(SHARED_LIBRARY) + regsvr32 -s $(DIST)/bin/$(SHARED_LIBRARY) include $(topsrcdir)/config/rules.mk diff --git a/config/config.mk b/config/config.mk index 71f130e323a9..ff32cee5deb9 100644 --- a/config/config.mk +++ b/config/config.mk @@ -307,8 +307,8 @@ OS_LDFLAGS += $(_DEBUG_LDFLAGS) ifeq ($(OS_ARCH)_$(GNU_CC),WINNT_) ifdef MOZ_DEBUG ifneq (,$(MOZ_BROWSE_INFO)$(MOZ_BSCFILE)) -OS_CFLAGS += /FR -OS_CXXFLAGS += /FR +OS_CFLAGS += -FR +OS_CXXFLAGS += -FR endif else # if MOZ_DEBUG is not set and MOZ_PROFILE is set, then we generate @@ -318,30 +318,30 @@ else # symbols in separate PDB files, rather than embedded into the binary. ifneq (,$(MOZ_PROFILE)$(MOZ_DEBUG_SYMBOLS)) MOZ_OPTIMIZE_FLAGS=-Zi -O1 -UDEBUG -DNDEBUG -OS_LDFLAGS = /DEBUG /OPT:REF /OPT:nowin98 +OS_LDFLAGS = -DEBUG -OPT:REF -OPT:nowin98 ifdef MOZ_PROFILE -OS_LDFLAGS += /PDB:NONE +OS_LDFLAGS += -PDB:NONE endif endif ifdef MOZ_QUANTIFY -# /FIXED:NO is needed for Quantify to work, but it increases the size +# -FIXED:NO is needed for Quantify to work, but it increases the size # of executables, so only use it if building for Quantify. -WIN32_EXE_LDFLAGS=/FIXED:NO +WIN32_EXE_LDFLAGS=-FIXED:NO -# We need /OPT:NOICF to prevent identical methods from being merged together. +# We need -OPT:NOICF to prevent identical methods from being merged together. # Otherwise, Quantify doesn't know which method was actually called when it's # showing you the profile. -OS_LDFLAGS += /OPT:NOICF +OS_LDFLAGS += -OPT:NOICF endif # if MOZ_COVERAGE is set, we handle pdb files slightly differently ifdef MOZ_COVERAGE MOZ_OPTIMIZE_FLAGS=-Zi -O1 -UDEBUG -DNDEBUG -OS_LDFLAGS = /DEBUG /PDB:NONE /OPT:REF /OPT:nowin98 +OS_LDFLAGS = -DEBUG -PDB:NONE -OPT:REF -OPT:nowin98 _ORDERFILE := $(wildcard $(srcdir)/win32.order) ifneq (,$(_ORDERFILE)) -OS_LDFLAGS += /ORDER:@$(srcdir)/win32.order +OS_LDFLAGS += -ORDER:@$(srcdir)/win32.order endif endif # MOZ_COVERAGE @@ -352,7 +352,7 @@ endif # ifdef NS_TRACE_MALLOC MOZ_OPTIMIZE_FLAGS=-Zi -Od -UDEBUG -DNDEBUG -OS_LDFLAGS = /DEBUG /PDB:NONE /OPT:REF /OPT:nowin98 +OS_LDFLAGS = -DEBUG -PDB:NONE -OPT:REF -OPT:nowin98 endif # NS_TRACE_MALLOC @@ -619,9 +619,9 @@ endif # CROSS_COMPILE ifeq ($(MOZ_OS2_TOOLS),VACPP) ifdef USE_STATIC_LIBS -RTL_FLAGS += /Gd- +RTL_FLAGS += -Gd- else # !USE_STATIC_LIBS -RTL_FLAGS += /Gd+ +RTL_FLAGS += -Gd+ endif endif @@ -743,27 +743,27 @@ endif ifdef MOZ_WINCONSOLE ifeq ($(MOZ_WINCONSOLE),1) ifeq ($(MOZ_OS2_TOOLS),EMX) -BIN_FLAGS += -Zlinker /PM:VIO +BIN_FLAGS += -Zlinker -PM:VIO endif ifeq ($(OS_ARCH),WINNT) ifdef GNU_CC WIN32_EXE_LDFLAGS += -mconsole else -WIN32_EXE_LDFLAGS += /SUBSYSTEM:CONSOLE +WIN32_EXE_LDFLAGS += -SUBSYSTEM:CONSOLE endif endif else # MOZ_WINCONSOLE ifeq ($(MOZ_OS2_TOOLS),VACPP) -LDFLAGS += /PM:PM +LDFLAGS += -PM:PM endif ifeq ($(MOZ_OS2_TOOLS),EMX) -BIN_FLAGS += -Zlinker /PM:PM +BIN_FLAGS += -Zlinker -PM:PM endif ifeq ($(OS_ARCH),WINNT) ifdef GNU_CC WIN32_EXE_LDFLAGS += -mwindows else -WIN32_EXE_LDFLAGS += /SUBSYSTEM:WINDOWS +WIN32_EXE_LDFLAGS += -SUBSYSTEM:WINDOWS endif endif endif diff --git a/config/rules.mk b/config/rules.mk index 54eb72d5c090..25d26b2ff475 100644 --- a/config/rules.mk +++ b/config/rules.mk @@ -196,11 +196,11 @@ endif # LIBRARY_NAME endif # MOZ_MAPINFO ifdef DEFFILE -OS_LDFLAGS += /DEF:$(DEFFILE) +OS_LDFLAGS += -DEF:$(DEFFILE) endif ifdef MAPFILE -OS_LDFLAGS += /MAP:$(MAPFILE) /MAPINFO:LINES +OS_LDFLAGS += -MAP:$(MAPFILE) -MAPINFO:LINES #CFLAGS += -Fm$(MAPFILE) #CXXFLAGS += -Fm$(MAPFILE) endif @@ -870,14 +870,14 @@ alltags: # $(PROGRAM): $(PROGOBJS) $(LIBS_DEPS) $(EXTRA_DEPS) $(EXE_DEF_FILE) $(RESFILE) Makefile Makefile.in ifeq (WINCE,$(OS_ARCH)) - $(LD) /NOLOGO /OUT:$@ $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(PROGOBJS) $(RESFILE) $(LIBS) $(EXTRA_LIBS) $(OS_LIBS) + $(LD) -NOLOGO -OUT:$@ $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(PROGOBJS) $(RESFILE) $(LIBS) $(EXTRA_LIBS) $(OS_LIBS) else ifeq ($(MOZ_OS2_TOOLS),VACPP) - $(LD) -OUT:$@ $(LDFLAGS) $(PROGOBJS) $(LIBS) $(EXTRA_LIBS) $(OS_LIBS) $(EXE_DEF_FILE) /ST:0x100000 + $(LD) -OUT:$@ $(LDFLAGS) $(PROGOBJS) $(LIBS) $(EXTRA_LIBS) $(OS_LIBS) $(EXE_DEF_FILE) -ST:0x100000 else ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH)) - $(LD) /NOLOGO /OUT:$@ /PDB:$(PDBFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(PROGOBJS) $(RESFILE) $(LIBS) $(EXTRA_LIBS) $(OS_LIBS) + $(LD) -NOLOGO -OUT:$@ -PDB:$(PDBFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(PROGOBJS) $(RESFILE) $(LIBS) $(EXTRA_LIBS) $(OS_LIBS) else ifeq ($(CPP_PROG_LINK),1) $(CCC) -o $@ $(CXXFLAGS) $(WRAP_MALLOC_CFLAGS) $(PROGOBJS) $(RESFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) $(WRAP_MALLOC_LIB) $(PROFILER_LIBS) $(EXE_DEF_FILE) @@ -903,15 +903,15 @@ endif # BeOS $(HOST_PROGRAM): $(HOST_PROGOBJS) $(HOST_LIBS_DEPS) $(HOST_EXTRA_DEPS) Makefile Makefile.in ifeq ($(MOZ_OS2_TOOLS),VACPP) - $(LD) -OUT:$@ $(LDFLAGS) $(HOST_OBJS) $(HOST_LIBS) $(EXTRA_LIBS) /ST:0x100000 + $(LD) -OUT:$@ $(LDFLAGS) $(HOST_OBJS) $(HOST_LIBS) $(EXTRA_LIBS) -ST:0x100000 else ifeq (WINCE,$(OS_ARCH)) - $(HOST_LD) /NOLOGO /OUT:$@ $(HOST_OBJS) $(WIN32_EXE_LDFLAGS) $(HOST_LIBS) $(EXTRA_LIBS) + $(HOST_LD) -NOLOGO -OUT:$@ $(HOST_OBJS) $(WIN32_EXE_LDFLAGS) $(HOST_LIBS) $(EXTRA_LIBS) endif ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH)) - $(HOST_LD) /NOLOGO /OUT:$@ /PDB:$(PDBFILE) $(HOST_OBJS) $(WIN32_EXE_LDFLAGS) $(HOST_LIBS) $(EXTRA_LIBS) + $(HOST_LD) -NOLOGO -OUT:$@ -PDB:$(PDBFILE) $(HOST_OBJS) $(WIN32_EXE_LDFLAGS) $(HOST_LIBS) $(EXTRA_LIBS) else $(HOST_CC) -o $@ $(HOST_CFLAGS) $(HOST_LDFLAGS) $(HOST_PROGOBJS) $(HOST_LIBS) $(HOST_EXTRA_LIBS) endif @@ -927,13 +927,13 @@ endif # $(SIMPLE_PROGRAMS): %$(BIN_SUFFIX): %.$(OBJ_SUFFIX) $(LIBS_DEPS) $(EXTRA_DEPS) Makefile Makefile.in ifeq (WINCE,$(OS_ARCH)) - $(LD) /nologo /entry:main /out:$@ $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS) $(EXTRA_LIBS) $(OS_LIBS) + $(LD) -nologo -entry:main -out:$@ $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS) $(EXTRA_LIBS) $(OS_LIBS) else ifeq ($(MOZ_OS2_TOOLS),VACPP) - $(LD) /Out:$@ $< $(LDFLAGS) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(WRAP_MALLOC_LIB) $(PROFILER_LIBS) + $(LD) -Out:$@ $< $(LDFLAGS) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(WRAP_MALLOC_LIB) $(PROFILER_LIBS) else ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH)) - $(LD) /nologo /out:$@ /pdb:$(PDBFILE) $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS) $(EXTRA_LIBS) $(OS_LIBS) + $(LD) -nologo -out:$@ -pdb:$(PDBFILE) $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS) $(EXTRA_LIBS) $(OS_LIBS) else ifeq ($(CPP_PROG_LINK),1) $(CCC) $(WRAP_MALLOC_CFLAGS) $(CXXFLAGS) -o $@ $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(WRAP_MALLOC_LIB) $(PROFILER_LIBS) $(BIN_FLAGS) @@ -1077,7 +1077,7 @@ endif # NO_LD_ARCHIVE_FLAGS $(MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(LOBJS) $(SUB_SHLOBJS) $(RESFILE) $(LDFLAGS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE) $(SHLIB_LDENDFILE) @rm -f foodummyfilefoo $(SUB_SHLOBJS) else # os2 vacpp - $(MKSHLIB) /O:$@ /DLL /INC:_dllentry $(LDFLAGS) $(OBJS) $(LOBJS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE) + $(MKSHLIB) -O:$@ -DLL -INC:_dllentry $(LDFLAGS) $(OBJS) $(LOBJS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE) endif # !os2 vacpp chmod +x $@ ifndef NO_COMPONENT_LINK_MAP diff --git a/configure b/configure index 8b5886771b71..1fb7aa4b7f07 100755 --- a/configure +++ b/configure @@ -2856,8 +2856,8 @@ echo "configure:2852: checking for midl flags" >&5 # This switches us back to the old behaviour. When we drop # support for Windows older than Win2k, we should remove # this. - MIDL_FLAGS="${MIDL_FLAGS} /no_robust" - echo "$ac_t""need /no_robust" 1>&6 + MIDL_FLAGS="${MIDL_FLAGS} -no_robust" + echo "$ac_t""need -no_robust" 1>&6 else MIDL_FLAGS="${MIDL_FLAGS}" echo "$ac_t""none needed" 1>&6 @@ -5470,8 +5470,8 @@ EOF *-wince*) - AR_LIST="$AR /list" - AR_EXTRACT="$AR /extract" + AR_LIST="$AR -list" + AR_EXTRACT="$AR -extract" AR_DELETE="$AR d" AR_FLAGS='-OUT:"$@"' @@ -5487,16 +5487,16 @@ EOF HOST_CC=cl HOST_CXX=cl HOST_LD=link - HOST_AR='lib /OUT:$@' + HOST_AR='lib -OUT:$@' MOZ_OPTIMIZE_FLAGS='-O1' - AR_FLAGS='/NOLOGO /OUT:"$@"' + AR_FLAGS='-NOLOGO -OUT:"$@"' ASM_SUFFIX=asm CFLAGS="$CFLAGS -W3 -Gy -Fd\$(PDBFILE)" CXXFLAGS="$CXXFLAGS -W3 -Gy -Fd\$(PDBFILE)" DLL_PREFIX= DOXYGEN=: - DSO_LDOPTS=/SUBSYSTEM:WINDOWSCE + DSO_LDOPTS=-SUBSYSTEM:WINDOWSCE DYNAMIC_XPCOM_LIBS='$(DIST)/lib/xpcom.lib $(DIST)/lib/xpcom_core.lib' GARBAGE= IMPORT_LIB_SUFFIX=lib @@ -5504,14 +5504,14 @@ EOF LIBXUL_LIBS='$(DIST)/lib/xpcom.lib $(DIST)/lib/xul.lib' LIB_PREFIX= LIB_SUFFIX=lib - MKCSHLIB='$(LD) /NOLOGO /DLL /OUT:$@ $(DSO_LDOPTS)' - MKSHLIB='$(LD) /NOLOGO /DLL /OUT:$@ $(DSO_LDOPTS)' + MKCSHLIB='$(LD) -NOLOGO -DLL -OUT:$@ $(DSO_LDOPTS)' + MKSHLIB='$(LD) -NOLOGO -DLL -OUT:$@ $(DSO_LDOPTS)' MKSHLIB_FORCE_ALL= MKSHLIB_UNFORCE_ALL= MOZ_COMPONENT_NSPR_LIBS='$(NSPR_LIBS)' MOZ_COMPONENT_NSPR_LIBS='$(NSPR_LIBS)' MOZ_DEBUG_FLAGS='-Zi' - MOZ_DEBUG_LDFLAGS='/DEBUG /DEBUGTYPE:CV' + MOZ_DEBUG_LDFLAGS='-DEBUG -DEBUGTYPE:CV' MOZ_FIX_LINK_PATHS= MOZ_JPEG_LIBS='$(DIST)/lib/mozjpeg.lib' MOZ_JS_LIBS='$(DIST)/lib/js$(MOZ_BITS)$(VERSION_NUMBER).lib' @@ -5632,16 +5632,16 @@ EOF DLL_PREFIX= LIB_PREFIX= IMPORT_LIB_SUFFIX=lib - MKSHLIB='$(LD) /NOLOGO /DLL /OUT:$@ /PDB:$(PDBFILE) $(DSO_LDOPTS)' - MKCSHLIB='$(LD) /NOLOGO /DLL /OUT:$@ /PDB:$(PDBFILE) $(DSO_LDOPTS)' + MKSHLIB='$(LD) -NOLOGO -DLL -OUT:$@ -PDB:$(PDBFILE) $(DSO_LDOPTS)' + MKCSHLIB='$(LD) -NOLOGO -DLL -OUT:$@ -PDB:$(PDBFILE) $(DSO_LDOPTS)' MKSHLIB_FORCE_ALL= MKSHLIB_UNFORCE_ALL= - DSO_LDOPTS=/SUBSYSTEM:WINDOWS + DSO_LDOPTS=-SUBSYSTEM:WINDOWS CFLAGS="$CFLAGS -W3 -Gy -Fd\$(PDBFILE)" CXXFLAGS="$CXXFLAGS -W3 -Gy -Fd\$(PDBFILE)" LIBS="$LIBS kernel32.lib user32.lib gdi32.lib winmm.lib wsock32.lib advapi32.lib" MOZ_DEBUG_FLAGS='-Zi' - MOZ_DEBUG_LDFLAGS='/DEBUG /DEBUGTYPE:CV' + MOZ_DEBUG_LDFLAGS='-DEBUG -DEBUGTYPE:CV' MOZ_OPTIMIZE_FLAGS='-O1' MOZ_JPEG_LIBS='$(DIST)/lib/jpeg$(MOZ_BITS)$(VERSION_NUMBER).lib' MOZ_ZLIB_LIBS='$(DIST)/lib/mozz.lib' diff --git a/configure.in b/configure.in index a8775ab5a474..a871cde55b2d 100644 --- a/configure.in +++ b/configure.in @@ -30,6 +30,8 @@ dnl LDAP support dnl Seth Spitzer dnl xpctools support dnl Benjamin Smedberg +dnl Howard Chu +dnl MSYS support dnl dnl Process this file with autoconf to produce a configure script. dnl ======================================================== @@ -364,8 +366,8 @@ case "$target" in # This switches us back to the old behaviour. When we drop # support for Windows older than Win2k, we should remove # this. - MIDL_FLAGS="${MIDL_FLAGS} /no_robust" - AC_MSG_RESULT([need /no_robust]) + MIDL_FLAGS="${MIDL_FLAGS} -no_robust" + AC_MSG_RESULT([need -no_robust]) else MIDL_FLAGS="${MIDL_FLAGS}" AC_MSG_RESULT([none needed]) @@ -1159,8 +1161,8 @@ case "$target" in *-wince*) - AR_LIST="$AR /list" - AR_EXTRACT="$AR /extract" + AR_LIST="$AR -list" + AR_EXTRACT="$AR -extract" AR_DELETE="$AR d" AR_FLAGS='-OUT:"$@"' @@ -1176,16 +1178,16 @@ case "$target" in HOST_CC=cl HOST_CXX=cl HOST_LD=link - HOST_AR='lib /OUT:$@' + HOST_AR='lib -OUT:$@' MOZ_OPTIMIZE_FLAGS='-O1' - AR_FLAGS='/NOLOGO /OUT:"$@"' + AR_FLAGS='-NOLOGO -OUT:"$@"' ASM_SUFFIX=asm CFLAGS="$CFLAGS -W3 -Gy -Fd\$(PDBFILE)" CXXFLAGS="$CXXFLAGS -W3 -Gy -Fd\$(PDBFILE)" DLL_PREFIX= DOXYGEN=: - DSO_LDOPTS=/SUBSYSTEM:WINDOWSCE + DSO_LDOPTS=-SUBSYSTEM:WINDOWSCE DYNAMIC_XPCOM_LIBS='$(DIST)/lib/xpcom.lib $(DIST)/lib/xpcom_core.lib' GARBAGE= IMPORT_LIB_SUFFIX=lib @@ -1193,14 +1195,14 @@ case "$target" in LIBXUL_LIBS='$(DIST)/lib/xpcom.lib $(DIST)/lib/xul.lib' LIB_PREFIX= LIB_SUFFIX=lib - MKCSHLIB='$(LD) /NOLOGO /DLL /OUT:$@ $(DSO_LDOPTS)' - MKSHLIB='$(LD) /NOLOGO /DLL /OUT:$@ $(DSO_LDOPTS)' + MKCSHLIB='$(LD) -NOLOGO -DLL -OUT:$@ $(DSO_LDOPTS)' + MKSHLIB='$(LD) -NOLOGO -DLL -OUT:$@ $(DSO_LDOPTS)' MKSHLIB_FORCE_ALL= MKSHLIB_UNFORCE_ALL= MOZ_COMPONENT_NSPR_LIBS='$(NSPR_LIBS)' MOZ_COMPONENT_NSPR_LIBS='$(NSPR_LIBS)' MOZ_DEBUG_FLAGS='-Zi' - MOZ_DEBUG_LDFLAGS='/DEBUG /DEBUGTYPE:CV' + MOZ_DEBUG_LDFLAGS='-DEBUG -DEBUGTYPE:CV' MOZ_FIX_LINK_PATHS= MOZ_JPEG_LIBS='$(DIST)/lib/mozjpeg.lib' MOZ_JS_LIBS='$(DIST)/lib/js$(MOZ_BITS)$(VERSION_NUMBER).lib' @@ -1288,16 +1290,16 @@ case "$target" in DLL_PREFIX= LIB_PREFIX= IMPORT_LIB_SUFFIX=lib - MKSHLIB='$(LD) /NOLOGO /DLL /OUT:$@ /PDB:$(PDBFILE) $(DSO_LDOPTS)' - MKCSHLIB='$(LD) /NOLOGO /DLL /OUT:$@ /PDB:$(PDBFILE) $(DSO_LDOPTS)' + MKSHLIB='$(LD) -NOLOGO -DLL -OUT:$@ -PDB:$(PDBFILE) $(DSO_LDOPTS)' + MKCSHLIB='$(LD) -NOLOGO -DLL -OUT:$@ -PDB:$(PDBFILE) $(DSO_LDOPTS)' MKSHLIB_FORCE_ALL= MKSHLIB_UNFORCE_ALL= - DSO_LDOPTS=/SUBSYSTEM:WINDOWS + DSO_LDOPTS=-SUBSYSTEM:WINDOWS CFLAGS="$CFLAGS -W3 -Gy -Fd\$(PDBFILE)" CXXFLAGS="$CXXFLAGS -W3 -Gy -Fd\$(PDBFILE)" LIBS="$LIBS kernel32.lib user32.lib gdi32.lib winmm.lib wsock32.lib advapi32.lib" MOZ_DEBUG_FLAGS='-Zi' - MOZ_DEBUG_LDFLAGS='/DEBUG /DEBUGTYPE:CV' + MOZ_DEBUG_LDFLAGS='-DEBUG -DEBUGTYPE:CV' MOZ_OPTIMIZE_FLAGS='-O1' MOZ_JPEG_LIBS='$(DIST)/lib/jpeg$(MOZ_BITS)$(VERSION_NUMBER).lib' MOZ_ZLIB_LIBS='$(DIST)/lib/mozz.lib' diff --git a/directory/c-sdk/build.mk b/directory/c-sdk/build.mk index b49c70fb1aab..9b7d23acb0b1 100644 --- a/directory/c-sdk/build.mk +++ b/directory/c-sdk/build.mk @@ -251,7 +251,7 @@ endif ifeq ($(OS_ARCH), WINNT) ifndef NS_USE_GCC -DLLEXPORTS_PREFIX=/DEF: +DLLEXPORTS_PREFIX=-DEF: USE_DLL_EXPORTS_FILE = 1 endif endif @@ -411,7 +411,7 @@ LINK_EXE = $(CC_FOR_LINK) -o $@ $(LDFLAGS) $(LCFLAGS) $(DEPLIBS) $(OBJS) $(EXTRA LINK_LIB = $(AR) cr $@ $(OBJS) LINK_DLL = $(CC_FOR_LINK) -shared -Wl,--export-all-symbols -Wl,--out-implib -Wl,$(@:.$(DLL_SUFFIX)=.$(LIB_SUFFIX)) $(LLFLAGS) $(DLL_LDFLAGS) -o $@ $(OBJS) $(EXTRA_LIBS) $(EXTRA_DLL_LIBS) else -DEBUG_LINK_OPT=/DEBUG +DEBUG_LINK_OPT=-DEBUG ifeq ($(BUILD_OPT), 1) ifndef MOZ_DEBUG_SYMBOLS DEBUG_LINK_OPT= @@ -421,17 +421,17 @@ endif SUBSYSTEM=CONSOLE ifndef MOZ_DEBUG_SYMBOLS -DEBUG_FLAGS=/PDB:NONE /DEBUGTYPE:BOTH +DEBUG_FLAGS=-PDB:NONE -DEBUGTYPE:BOTH endif -LINK_EXE = $(CYGWIN_WRAPPER) link $(DEBUG_LINK_OPT) -OUT:"$@" /MAP $(ALDFLAGS) $(LDFLAGS) $(ML_DEBUG) \ - $(LCFLAGS) /NOLOGO $(DEBUG_FLAGS) /INCREMENTAL:NO \ - /NODEFAULTLIB:MSVCRTD /SUBSYSTEM:$(SUBSYSTEM) $(DEPLIBS) \ +LINK_EXE = $(CYGWIN_WRAPPER) link $(DEBUG_LINK_OPT) -OUT:"$@" -MAP $(ALDFLAGS) $(LDFLAGS) $(ML_DEBUG) \ + $(LCFLAGS) -NOLOGO $(DEBUG_FLAGS) -INCREMENTAL:NO \ + -NODEFAULTLIB:MSVCRTD -SUBSYSTEM:$(SUBSYSTEM) $(DEPLIBS) \ $(EXTRA_LIBS) $(PLATFORMLIBS) $(OBJS) LINK_LIB = $(CYGWIN_WRAPPER) lib -OUT:"$@" $(OBJS) -LINK_DLL = $(CYGWIN_WRAPPER) link $(DEBUG_LINK_OPT) /nologo /MAP /DLL $(DEBUG_FLAGS) \ - $(ML_DEBUG) /SUBSYSTEM:$(SUBSYSTEM) $(LLFLAGS) $(DLL_LDFLAGS) \ - $(EXTRA_LIBS) /out:"$@" $(OBJS) +LINK_DLL = $(CYGWIN_WRAPPER) link $(DEBUG_LINK_OPT) -nologo -MAP -DLL $(DEBUG_FLAGS) \ + $(ML_DEBUG) -SUBSYSTEM:$(SUBSYSTEM) $(LLFLAGS) $(DLL_LDFLAGS) \ + $(EXTRA_LIBS) -out:"$@" $(OBJS) endif # NS_USE_GCC else # WINNT # diff --git a/directory/c-sdk/config/Makefile.in b/directory/c-sdk/config/Makefile.in index 18f22029877c..4f78c6934e84 100644 --- a/directory/c-sdk/config/Makefile.in +++ b/directory/c-sdk/config/Makefile.in @@ -102,7 +102,7 @@ endif ifeq ($(MOZ_OS2_TOOLS),EMX) XCFLAGS = $(OS_EXE_CFLAGS) -XLDOPTS = -Zomf -Zlinker /PM:VIO +XLDOPTS = -Zomf -Zlinker -PM:VIO endif ifeq ($(MOZ_OS2_TOOLS),VACPP) @@ -123,7 +123,7 @@ endif OUTOPTION = -o # end of the line ifeq (,$(filter-out WINNT OS2,$(OS_ARCH))) ifndef NS_USE_GCC -OUTOPTION = /Fe +OUTOPTION = -Fe endif endif diff --git a/embedding/browser/activex/src/control/Makefile.in b/embedding/browser/activex/src/control/Makefile.in index 5a7af1ec223e..af404dbf576e 100644 --- a/embedding/browser/activex/src/control/Makefile.in +++ b/embedding/browser/activex/src/control/Makefile.in @@ -119,8 +119,8 @@ ENABLE_CXX_EXCEPTIONS = 1 include $(topsrcdir)/config/rules.mk -CXXFLAGS += /D "WIN32" /U "ClientWallet" -LDFLAGS += -SUBSYSTEM:windows /DLL +CXXFLAGS += -D "WIN32" -U "ClientWallet" +LDFLAGS += -SUBSYSTEM:windows -DLL ifdef MOZ_NO_DEBUG_RTL DEFINES += -DMOZ_NO_DEBUG_RTL @@ -136,7 +136,7 @@ $(DEFFILE): mkctldef.sh $(srcdir)/mkctldef.sh $@ done_gen: MozillaControl.idl - $(MIDL) $(MIDL_FLAGS) /Oicf /h MozillaControl.h /iid MozillaControl_i.c $(srcdir)/MozillaControl.idl + $(MIDL) $(MIDL_FLAGS) -Oicf -h MozillaControl.h -iid MozillaControl_i.c $(srcdir)/MozillaControl.idl touch $@ $(MIDL_GENERATED_FILES): done_gen diff --git a/embedding/browser/activex/src/control_kicker/Makefile.in b/embedding/browser/activex/src/control_kicker/Makefile.in index c29e065cab90..fa6432dec27b 100644 --- a/embedding/browser/activex/src/control_kicker/Makefile.in +++ b/embedding/browser/activex/src/control_kicker/Makefile.in @@ -67,16 +67,16 @@ ENABLE_CXX_EXCEPTIONS = 1 include $(topsrcdir)/config/rules.mk -CXXFLAGS += /D "WIN32" /GF /MT /O1 +CXXFLAGS += -D "WIN32" -GF -MT -O1 libs:: ifdef MOZ_ACTIVEX_REGISTRATION ifneq ($(OS_TARGET),WIN98) - -regsvr32 /s /c $(DIST)/bin/$(SHARED_LIBRARY) + -regsvr32 -s -c $(DIST)/bin/$(SHARED_LIBRARY) endif endif clean clobber clobber_all realclean distclean:: - -regsvr32 /s /c /u $(DIST)/bin/$(SHARED_LIBRARY) + -regsvr32 -s -c -u $(DIST)/bin/$(SHARED_LIBRARY) control_kicker.cpp StdAfx.cpp: StdAfx.h diff --git a/embedding/tests/mfcembed/Makefile.in b/embedding/tests/mfcembed/Makefile.in index e3c50157e55d..4ecd6d39f24a 100644 --- a/embedding/tests/mfcembed/Makefile.in +++ b/embedding/tests/mfcembed/Makefile.in @@ -152,7 +152,7 @@ LOCAL_INCLUDES = -I$(srcdir)/components # # Set it to 256k. See bug 127069. # -LDFLAGS += /HEAP:0x40000 +LDFLAGS += -HEAP:0x40000 include $(topsrcdir)/config/config.mk @@ -189,12 +189,12 @@ endif # BUILD_STATIC_LIBS # UNICODE ifdef BUILD_UNICODE_MFCEMBED -CXXFLAGS += /D "_UNICODE" -LDFLAGS += /ENTRY:wWinMainCRTStartup +CXXFLAGS += -D "_UNICODE" +LDFLAGS += -ENTRY:wWinMainCRTStartup endif -CXXFLAGS += /D "_AFXDLL" /D "USE_SINGLE_SIGN_ON" -DMOZILLA_VERSION=\"$(MOZILLA_VERSION)\" -LDFLAGS += /SUBSYSTEM:windows +CXXFLAGS += -D "_AFXDLL" -D "USE_SINGLE_SIGN_ON" -DMOZILLA_VERSION=\"$(MOZILLA_VERSION)\" +LDFLAGS += -SUBSYSTEM:windows libs:: mfcembed.htm $(INSTALL) $^ $(DIST)/bin diff --git a/embedding/tests/mfcembed/components/Makefile.in b/embedding/tests/mfcembed/components/Makefile.in index 3e9bd36fcdc7..cc7f2df10ff1 100644 --- a/embedding/tests/mfcembed/components/Makefile.in +++ b/embedding/tests/mfcembed/components/Makefile.in @@ -81,11 +81,11 @@ include $(topsrcdir)/config/rules.mk # UNICODE ifdef BUILD_UNICODE_MFCEMBED -CXXFLAGS += /D "_UNICODE" +CXXFLAGS += -D "_UNICODE" endif -CXXFLAGS += /D "_AFXDLL" /D "USE_SINGLE_SIGN_ON" /D "_WINDLL" -LDFLAGS += /SUBSYSTEM:windows +CXXFLAGS += -D "_AFXDLL" -D "USE_SINGLE_SIGN_ON" -D "_WINDLL" +LDFLAGS += -SUBSYSTEM:windows Dialogs.res: Dialogs.rc resource.h diff --git a/js/src/Makefile.in b/js/src/Makefile.in index 7019d964584d..b3b1c6227c65 100644 --- a/js/src/Makefile.in +++ b/js/src/Makefile.in @@ -205,7 +205,7 @@ INCLUDES += -I$(srcdir) # are taken violates the ISO C and C++ standards. ifndef MOZ_DEBUG ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH)) -LDFLAGS += /OPT:NOICF +LDFLAGS += -OPT:NOICF endif endif @@ -247,9 +247,9 @@ endif # Prevent floating point errors caused by VC++ optimizations ifeq ($(OS_ARCH)_$(GNU_CC),WINNT_) ifeq (,$(filter-out 1200 1300 1310,$(_MSC_VER))) -CFLAGS += /Op +CFLAGS += -Op else -CFLAGS += /fp:precise +CFLAGS += -fp:precise endif endif # WINNT diff --git a/nsprpub/config/Makefile.in b/nsprpub/config/Makefile.in index 7a1ccbd964e7..890f8c6b57ea 100644 --- a/nsprpub/config/Makefile.in +++ b/nsprpub/config/Makefile.in @@ -128,7 +128,7 @@ endif OUTOPTION = -o # end of the line ifeq (,$(filter-out WINNT WIN95,$(OS_TARGET))) ifndef NS_USE_GCC -OUTOPTION = /Fe +OUTOPTION = -Fe endif endif diff --git a/nsprpub/lib/ds/Makefile.in b/nsprpub/lib/ds/Makefile.in index 516e1a378d27..2916ab709886 100644 --- a/nsprpub/lib/ds/Makefile.in +++ b/nsprpub/lib/ds/Makefile.in @@ -66,7 +66,7 @@ ifeq ($(OS_ARCH), WINNT) ifdef NS_USE_GCC DLLBASE=-Wl,--image-base -Wl,0x30000000 else -DLLBASE=/BASE:0x30000000 +DLLBASE=-BASE:0x30000000 endif # GCC RES=$(OBJDIR)/plds.res RESNAME=plds.rc diff --git a/nsprpub/lib/libc/src/Makefile.in b/nsprpub/lib/libc/src/Makefile.in index 162b3ed980da..fcdbae60b3c9 100644 --- a/nsprpub/lib/libc/src/Makefile.in +++ b/nsprpub/lib/libc/src/Makefile.in @@ -76,7 +76,7 @@ ifeq ($(OS_ARCH),WINNT) ifdef NS_USE_GCC DLLBASE=-Wl,--image-base -Wl,0x30000000 else -DLLBASE=/BASE:0x30000000 +DLLBASE=-BASE:0x30000000 endif RES=$(OBJDIR)/plc.res RESNAME=plc.rc diff --git a/nsprpub/lib/msgc/src/Makefile.in b/nsprpub/lib/msgc/src/Makefile.in index e822fc29aa74..de834cc567c8 100644 --- a/nsprpub/lib/msgc/src/Makefile.in +++ b/nsprpub/lib/msgc/src/Makefile.in @@ -72,7 +72,7 @@ ifeq ($(OS_ARCH), WINNT) ifdef NS_USE_GCC DLLBASE=-Wl,--image-base -Wl,0x30000000 else -DLLBASE=/BASE:0x30000000 +DLLBASE=-BASE:0x30000000 endif # GCC #RES=$(OBJDIR)/ds.res #RESNAME=$(MOD_DEPTH)/pr/src/nspr.rc diff --git a/nsprpub/lib/prstreams/Makefile.in b/nsprpub/lib/prstreams/Makefile.in index 5c1311b2560b..679c03d9070e 100644 --- a/nsprpub/lib/prstreams/Makefile.in +++ b/nsprpub/lib/prstreams/Makefile.in @@ -88,7 +88,7 @@ CXXSRCS = \ OBJS = $(addprefix $(OBJDIR)/,$(CSRCS:.c=.$(OBJ_SUFFIX)) $(CXXSRCS:.cpp=.$(OBJ_SUFFIX))) ifeq ($(OS_ARCH), WINNT) - DLLBASE=/BASE:0x30000000 + DLLBASE=-BASE:0x30000000 RES=$(OBJDIR)/prstrms.res RESNAME=prstrms.rc OS_LIBS = user32.lib diff --git a/nsprpub/pr/src/Makefile.in b/nsprpub/pr/src/Makefile.in index 1c6e1fa91281..cf2f522929ea 100644 --- a/nsprpub/pr/src/Makefile.in +++ b/nsprpub/pr/src/Makefile.in @@ -319,7 +319,7 @@ ifeq ($(OS_ARCH), WINNT) ifdef NS_USE_GCC DLLBASE=-Wl,--image-base -Wl,0x30000000 else -DLLBASE=/BASE:0x30000000 +DLLBASE=-BASE:0x30000000 endif # GCC RES=$(OBJDIR)/nspr.res RESNAME=nspr.rc diff --git a/nsprpub/pr/tests/dll/Makefile.in b/nsprpub/pr/tests/dll/Makefile.in index 62a214f4ce1e..906f5310919f 100644 --- a/nsprpub/pr/tests/dll/Makefile.in +++ b/nsprpub/pr/tests/dll/Makefile.in @@ -71,7 +71,7 @@ else ifdef NS_USE_GCC DLLBASE=-Wl,--image-base -Wl,0x30000000 else -DLLBASE=/BASE:0x30000000 +DLLBASE=-BASE:0x30000000 endif RES=$(OBJDIR)/my.res RESNAME=../../../pr/src/nspr.rc