ChangeLogTag: Mon Apr 5 10:43:03 2004 Chad Elliott <elliott_c@ociweb.com>

18 files changed, 343 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index 0a5fd03b..8a709dfe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+Mon Apr  5 10:43:03 2004  Chad Elliott  <elliott_c@ociweb.com>
+
         * README
         * USAGE
         * mpc.pl
diff --git a/config/bison.mpb b/config/bison.mpb
new file mode 100644
index 00000000..cc779697
--- /dev/null
+++ b/config/bison.mpb
@@ -0,0 +1,13 @@
+// $Id$
+project {
+  Define_Custom(BISON) {
+    automatic        = 1
+    command          = bison
+    commandflags     = -d
+    pch_postrule     = 1
+    inputext         = .y
+    pre_extension    = .tab
+    source_outputext = .c
+    header_outputext = .h
+  }
+}
diff --git a/config/default.rel b/config/default.rel
new file mode 100644
index 00000000..68f94b03
--- /dev/null
+++ b/config/default.rel
@@ -0,0 +1,6 @@
+// This is the default relative definitions.  Wildcards are acceptable.
+//
+// The first column is the name for which we create a relative definition.
+// The second (optional) column is the value to build up if it isn't defined
+// as an environmenment variable.
+*_ROOT
diff --git a/config/flex.mpb b/config/flex.mpb
new file mode 100644
index 00000000..7a9e10df
--- /dev/null
+++ b/config/flex.mpb
@@ -0,0 +1,12 @@
+// $Id$
+project {
+  Define_Custom(FLEX) {
+    automatic        = 1
+    command          = flex
+    commandflags     = -t
+    output_option    = >
+    pch_postrule     = 1
+    inputext         = .l
+    source_outputext = .c
+  }
+}
diff --git a/config/global.features b/config/global.features
new file mode 100644
index 00000000..ddc2ae55
--- /dev/null
+++ b/config/global.features
@@ -0,0 +1,17 @@
+// The global features file contains the default feature settings.
+// By default, if a feature isn't listed here then it is enabled.
+// If it is listed, then the value assigned to the feature is interpreted
+// as a boolean value.  You really shouldn't have to edit this file except
+// to change the defaults.  If you want to override these values you can do
+// one of two things.
+//
+// 1) Create a default.features in this directory with the features you
+//    want enabled or disabled.
+// 2) Create a feature file anywhere you like with the features you want and
+//    use the -feature_file option to specify where it is located.
+
+// By default we disable these.
+qt            = 0
+zlib          = 0
+mfc           = 0
+rpc           = 0
diff --git a/config/global.mpb b/config/global.mpb
new file mode 100644
index 00000000..4011554c
--- /dev/null
+++ b/config/global.mpb
@@ -0,0 +1,6 @@
+// -*- MPC -*-
+// $Id$
+
+project {
+  libout = .
+}
diff --git a/config/lex.mpb b/config/lex.mpb
new file mode 100644
index 00000000..03c506cd
--- /dev/null
+++ b/config/lex.mpb
@@ -0,0 +1,12 @@
+// $Id$
+project {
+  Define_Custom(LEX) {
+    automatic        = 1
+    command          = lex
+    commandflags     = -t
+    output_option    = >
+    pch_postrule     = 1
+    inputext         = .l
+    source_outputext = .c
+  }
+}
diff --git a/config/openssl.mpb b/config/openssl.mpb
new file mode 100644
index 00000000..c3f2c9ff
--- /dev/null
+++ b/config/openssl.mpb
@@ -0,0 +1,20 @@
+// -*- MPC -*-
+// $Id$
+
+// openssl is a completely different feature than ssl.
+// Currently ssl uses openssl, and openssl is enabled by
+// default. If we ever add a new ssl library, then you 
+// would likely enable only one ssl library feature.
+feature(openssl) {
+  specific(cbx, borland, bmake, nmake, em3, vc6, vc7, vc71) {
+    lit_libs += libeay32 ssleay32
+    includes += $(SSL_ROOT)/inc32
+    libpaths += $(SSL_ROOT)/out32dll $(SSL_ROOT)/out32
+  }
+
+  specific(gnuace, make, sle) {
+    lit_libs += ssl crypto
+    includes += $(SSL_ROOT)/include
+    libpaths += $(SSL_ROOT)/lib
+  }
+}
diff --git a/config/qt.mpb b/config/qt.mpb
new file mode 100644
index 00000000..dc2c7739
--- /dev/null
+++ b/config/qt.mpb
@@ -0,0 +1,18 @@
+// -*- MPC -*-
+// $Id$
+
+project {
+  includes += $(QTDIR)/include
+  libpaths += $(QTDIR)/lib
+  macros   += QT_THREAD_SUPPORT
+
+  specific(cbx, borland, bmake, nmake, em3, vc6, vc7, vc71) {
+    lit_libs += qt-mt230nc
+  }
+
+  // @@ Notice: If you are building with Cygwin, you may need to manually
+  //            change the following Qt library to qt-mt230nc.
+  specific(gnuace, make, sle) {
+    lit_libs += qt-mt
+  }
+}
diff --git a/config/qt_moc.mpb b/config/qt_moc.mpb
new file mode 100644
index 00000000..2dff6e61
--- /dev/null
+++ b/config/qt_moc.mpb
@@ -0,0 +1,14 @@
+// -*- MPC -*-
+// $Id$
+
+project : qt {
+  Define_Custom(MOC) {
+    automatic        = 0
+    command          = $(QTDIR)/bin/moc
+    output_option    = -o
+    pch_postrule     = 1
+    inputext         = .h
+    pre_extension    = _moc
+    source_outputext = .cpp
+  }
+}
diff --git a/config/rpc.mpb b/config/rpc.mpb
new file mode 100644
index 00000000..e79af8d6
--- /dev/null
+++ b/config/rpc.mpb
@@ -0,0 +1,14 @@
+// -*- MPC -*-
+// $Id$
+
+project {
+  requires += rpc
+  Define_Custom(rpcgen) {
+    command          = rpcgen
+    commandflags     = -C
+    pch_postrule     = 1
+    inputext         = .x
+    source_outputext = _svc.c, _clnt.c
+    header_outputext = .h
+  }
+}
diff --git a/config/zlib.mpb b/config/zlib.mpb
new file mode 100644
index 00000000..1c0ea21a
--- /dev/null
+++ b/config/zlib.mpb
@@ -0,0 +1,18 @@
+// -*- MPC -*-
+// $Id$
+
+feature(zlib) {
+  includes += $(ZLIB_ROOT)/include
+  libpaths += $(ZLIB_ROOT)/lib
+  macros   += ZLIB
+
+  specific(cbx, borland, bmake, nmake, em3, vc6, vc7, vc71) {
+    lit_libs += zlib
+  }
+
+  // @@ Notice: If you are building with Cygwin, you may need to manually
+  //            change the following library to zlib.
+  specific(gnuace, make, sle) {
+    lit_libs += z
+  }
+}
diff --git a/mpc.pl b/mpc.pl
new file mode 100755
index 00000000..69be9b02
--- /dev/null
+++ b/mpc.pl
@@ -0,0 +1,82 @@
+eval '(exit $?0)' && eval 'exec perl -w -S $0 ${1+"$@"}'
+    & eval 'exec perl -w -S $0 $argv:q'
+    if 0;
+
+# ******************************************************************
+#      Author: Chad Elliott
+#        Date: 6/17/2002
+#         $Id$
+# ******************************************************************
+
+# ******************************************************************
+# Pragma Section
+# ******************************************************************
+
+use strict;
+use Cwd;
+use File::Basename;
+
+my($basePath) = getExecutePath($0);
+unshift(@INC, $basePath . '/modules');
+
+require MPC;
+
+# ************************************************************
+# Subroutine Section
+# ************************************************************
+
+sub which {
+  my($prog)   = shift;
+  my($exec)   = $prog;
+  my($part)   = '';
+  my($envSep) = ($^O eq 'MSWin32' ? ';' : ':');
+
+  if (defined $ENV{'PATH'}) {
+    foreach $part (split(/$envSep/, $ENV{'PATH'})) {
+      $part .= "/$prog";
+      if ( -x $part ) {
+        $exec = $part;
+        last;
+      }
+    }
+  }
+
+  return $exec;
+}
+
+
+sub getExecutePath {
+  my($prog) = shift;
+  my($loc)  = '';
+
+  if ($prog ne basename($prog)) {
+    if ($prog =~ /^[\/\\]/ ||
+        $prog =~ /^[A-Za-z]:[\/\\]?/) {
+      $loc = dirname($prog);
+    }
+    else {
+      $loc = getcwd() . '/' . dirname($prog);
+    }
+  }
+  else {
+    $loc = dirname(which($prog));
+  }
+
+  if ($loc eq '.') {
+    $loc = getcwd();
+  }
+
+  if ($loc ne '') {
+    $loc .= '/';
+  }
+
+  return $loc;
+}
+
+
+# ************************************************************
+# Main Section
+# ************************************************************
+
+my($driver) = new MPC();
+exit($driver->execute($basePath, basename($0), \@ARGV));
diff --git a/mwc.pl b/mwc.pl
new file mode 100755
index 00000000..73d08e40
--- /dev/null
+++ b/mwc.pl
@@ -0,0 +1,82 @@
+eval '(exit $?0)' && eval 'exec perl -w -S $0 ${1+"$@"}'
+    & eval 'exec perl -w -S $0 $argv:q'
+    if 0;
+
+# ******************************************************************
+#      Author: Chad Elliott
+#        Date: 6/17/2002
+#         $Id$
+# ******************************************************************
+
+# ******************************************************************
+# Pragma Section
+# ******************************************************************
+
+use strict;
+use Cwd;
+use File::Basename;
+
+my($basePath) = getExecutePath($0);
+unshift(@INC, $basePath . '/modules');
+
+require MWC;
+
+# ************************************************************
+# Subroutine Section
+# ************************************************************
+
+sub which {
+  my($prog)   = shift;
+  my($exec)   = $prog;
+  my($part)   = '';
+  my($envSep) = ($^O eq 'MSWin32' ? ';' : ':');
+
+  if (defined $ENV{'PATH'}) {
+    foreach $part (split(/$envSep/, $ENV{'PATH'})) {
+      $part .= "/$prog";
+      if ( -x $part ) {
+        $exec = $part;
+        last;
+      }
+    }
+  }
+
+  return $exec;
+}
+
+
+sub getExecutePath {
+  my($prog) = shift;
+  my($loc)  = '';
+
+  if ($prog ne basename($prog)) {
+    if ($prog =~ /^[\/\\]/ ||
+        $prog =~ /^[A-Za-z]:[\/\\]?/) {
+      $loc = dirname($prog);
+    }
+    else {
+      $loc = getcwd() . '/' . dirname($prog);
+    }
+  }
+  else {
+    $loc = dirname(which($prog));
+  }
+
+  if ($loc eq '.') {
+    $loc = getcwd();
+  }
+
+  if ($loc ne '') {
+    $loc .= '/';
+  }
+
+  return $loc;
+}
+
+
+# ************************************************************
+# Main Section
+# ************************************************************
+
+my($driver) = new MWC();
+exit($driver->execute($basePath, basename($0), \@ARGV));
diff --git a/templates/automake.mpd b/templates/automake.mpd
index 3b499674..e28d8578 100644
--- a/templates/automake.mpd
+++ b/templates/automake.mpd
@@ -69,8 +69,7 @@ lib<%if(sharedname)%><%sharedname%><%else%><%staticname%><%endif%>_<%uc(grouped_
 <%endfor%>
 
 <%endfor%>
-lib<%if(sharedname)%><%sharedname%><%else%><%staticname%><%endif%>_la_LDFLAGS = $(X_LIBS) \
-  -version-info <%if(tao)%>@TAO_CURRENT@:@TAO_REVISION@:@TAO_AGE@<%else%>@ACE_CURRENT@:@ACE_REVISION@:@ACE_AGE@<%endif%>
+lib<%if(sharedname)%><%sharedname%><%else%><%staticname%><%endif%>_la_LDFLAGS = $(X_LIBS)
 
 lib<%if(sharedname)%><%sharedname%><%else%><%staticname%><%endif%>_la_LIBADD = $(X_PRE_LIBS) $(<%if(sharedname)%><%sharedname%><%else%><%staticname%><%endif%>_XLIBS) $(X_EXTRA_LIBS)
 <%else%>
diff --git a/templates/make.mpd b/templates/make.mpd
index 42bca444..382f5267 100644
--- a/templates/make.mpd
+++ b/templates/make.mpd
@@ -55,12 +55,12 @@ TEMPINCDIR    = <%tempinc%>/<%project_name%>
 <%endif%>
 <%endfor%>
 GENFLAGS      = <%genflags(-g)%>
-CPPFLAGS      = $(PICFLAGS) $(GENFLAGS)<%if(cppflags)%> <%cppflags%><%endif%><%foreach(configurations)%><%if(compileflags)%> <%compileflags%><%endif%><%if(cpu)%> -DCPU=$(CPU)<%endif%><%if(tempinc)%> <%tempincopt%>$(TEMPINCDIR)<%endif%><%endfor%><%foreach(platforms)%><%if(extracppflags)%> <%extracppflags%><%endif%><%endfor%><%foreach(configurations)%><%if(compilerflags)%> <%compilerflags%><%endif%><%endfor%><%if(pch_header)%><%foreach(pch_defines)%> -D<%pch_define%><%endfor%><%endif%><%if(includes)%><%foreach(includes)%> -I<%include%><%endfor%><%endif%><%if(macros)%><%foreach(macros)%> -D<%macro%><%endfor%><%endif%>
+CPPFLAGS      = $(PICFLAGS) $(GENFLAGS)<%if(cppflags)%> <%cppflags%><%endif%><%foreach(configurations)%><%if(compileflags)%> <%compileflags%><%endif%><%if(cpu)%> -DCPU=$(CPU)<%endif%><%if(tempinc)%> <%tempincopt%>$(TEMPINCDIR)<%endif%><%if(compilerflags)%> <%compilerflags%><%endif%><%if(pch_source && pchsupport)%><%foreach(pch_defines)%> -D<%pch_define%><%endfor%><%endif%><%endfor%><%foreach(platforms)%><%if(extracppflags)%> <%extracppflags%><%endif%><%endfor%><%if(includes)%><%foreach(includes)%> -I<%include%><%endfor%><%endif%><%if(macros)%><%foreach(macros)%> -D<%macro%><%endfor%><%endif%>
 <%if(arflags)%>
 ARFLAGS       = <%arflags%>
 <%endif%>
-SRC           = <%source_files%>
-OBJS          =<%foreach(source_files)%> <%basenoextension(source_file)%>.o<%endfor%><%foreach(platforms)%><%if(rc)%><%foreach(resource_files)%> <%resource_file%>.o<%endfor%><%endif%><%endfor%>
+SRC           =<%if(pch_source && pchsupport)%> <%pch_source%><%endif%> <%source_files%>
+OBJS          =<%if(pch_source && pchsupport)%> <%basenoextension(pch_source)%>.o<%endif%><%foreach(source_files)%> <%basenoextension(source_file)%>.o<%endfor%><%foreach(platforms)%><%if(rc)%><%foreach(resource_files)%> <%resource_file%>.o<%endfor%><%endif%><%endfor%>
 LDFLAGS       =<%if(libpaths)%><%foreach(libpaths)%> -L<%libpath%><%endfor%><%endif%><%foreach(configurations)%><%if(linkflags)%> <%linkflags%><%endif%><%endfor%>
 LDLIBS        =<%foreach(pure_libs)%> <%pure_lib%><%endfor%><%foreach(libs lit_libs)%> -l<%lib%><%endfor%><%foreach(platforms)%> <%ldlibs%><%endfor%>
 LINK.cc       = $(LD) $(LDFLAGS)
@@ -154,7 +154,7 @@ GENERATED_DIRTY    =<%foreach(custom_types)%><%foreach(custom_type->input_files)
 <%foreach(custom_type->input_files)%>
 <%if(custom_type->input_file->output_files)%>
 <%foreach(custom_type->input_file->output_files)%><%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>/<%basename(custom_type->input_file->output_file)%><%else%><%custom_type->input_file->output_file%><%endif%><%fornotlast(" ")%><%endfor%>: <%custom_type->input_file%><%if(custom_type->dependent)%> <%custom_type->command%><%endif%>
-	<%custom_type->command%> <%if(pch_header)%><%if(custom_type->pch_option)%><%custom_type->pch_option%><%pch_header%> <%endif%><%endif%><%if(flag_overrides(custom_type->input_file, commandflags))%><%flag_overrides(custom_type->input_file, commandflags)%><%else%><%custom_type->commandflags%><%endif%> <%custom_type->input_file%> <%if(custom_type->output_option)%><%custom_type->output_option%> $@<%endif%>
+	<%custom_type->command%> <%if(flag_overrides(custom_type->input_file, commandflags))%><%flag_overrides(custom_type->input_file, commandflags)%><%else%><%custom_type->commandflags%><%endif%> <%custom_type->input_file%> <%if(custom_type->output_option)%><%custom_type->output_option%> $@<%endif%>
 
 <%endif%>
 <%endfor%>
@@ -177,12 +177,17 @@ $(TEMPINCDIR):
 	@-test -d $(TEMPINCDIR) || mkdir -p $(TEMPINCDIR) 2> /dev/null || true
 
 <%endif%>
-<%endfor%>
+<%if(pch_source && pchsupport)%>
+<%basenoextension(pch_source)%>.o: <%pch_source%>
+	$(COMPILE.cc) <%if(pchcreate)%><%pchcreate%><%basename(pch_header)%>.gch <%endif%>$(EXPORTFLAGS) <%pch_source%> $(OUTPUT_OPTION)
+
+<%endif%>
 <%foreach(source_files)%>
 <%basenoextension(source_file)%>.o: <%source_file%>
-	$(COMPILE.cc) $(EXPORTFLAGS) <%source_file%> $(OUTPUT_OPTION)
+	$(COMPILE.cc) <%if(pchuse && pch_source && pchsupport)%><%pchuse%><%basename(pch_header)%>.gch <%endif%>$(EXPORTFLAGS) <%source_file%> $(OUTPUT_OPTION)
 
 <%endfor%>
+<%endfor%>
 <%if(resource_files)%>
 <%foreach(platforms)%>
 <%if(rc)%>
@@ -218,7 +223,7 @@ install:
 <%endif%>
 <%endif%>
 clean:
-	-$(RM) $(OBJS)
+	-$(RM) -r $(OBJS)<%foreach(configurations)%><%if(pch_source && pchsupport)%> <%basename(pch_header)%>.gch<%endif%><%endfor%>
 <%foreach(configurations)%>
 <%if(clean)%>
 	-$(RM) -r <%clean%>
@@ -226,7 +231,7 @@ clean:
 <%endfor%>
 
 realclean: clean
-	-$(RM) <%if(exename)%>$(BIN)<%else%>$(SHLIB) $(LIB)<%endif%><%if(install)%> <%install%>/$(INSTARGET)<%endif%>
+	-$(RM) -r <%if(exename)%>$(BIN)<%else%>$(SHLIB) $(LIB)<%endif%><%if(install)%> <%install%>/$(INSTARGET)<%endif%>
 <%if(custom_types)%>
 	-$(RM) -r $(GENERATED_DIRTY)
 <%endif%>
diff --git a/templates/makedll.mpt b/templates/makedll.mpt
index 426d9e19..f1e66b52 100644
--- a/templates/makedll.mpt
+++ b/templates/makedll.mpt
@@ -25,6 +25,7 @@ soext          = so
 exeext         =
 cppflags       =
 arflags        =
+pchsupport     = 1
 
 // ***********************************************************************
 // Configuration Section
@@ -36,6 +37,8 @@ cxx {
   tempincopt = "-ptr "
   tempinc    = cxx_repository
   platforms  = tru64
+  pchcreate  = "-nopch_messages -create_pch "
+  pchuse     = "-nopch_messages -use_pch "
 }
 
 gcc {
@@ -57,11 +60,15 @@ aCC {
   pic           = +Z
   platforms     = hpux
   compilerflags = -AA -D_RWSTD_MULTI_THREAD
+  pchcreate     = "+hdr_create "
+  pchuse        = "+hdr_use "
 }
 
 xlC_r {
   cxx       = xlC_r
   platforms = aix
+  pchcreate = -qgenpcomp=
+  pchuse    = -qusepcomp=
 }
 
 SGICC {
@@ -70,6 +77,8 @@ SGICC {
   linkflags = -Wl,-woff,84
   clean     = ii_files
   platforms = irix
+  pchcreate = -LANG:create_pch=
+  pchuse    = -LANG:use_pch=
 }
 
 wrsppc {
diff --git a/templates/sle.mpd b/templates/sle.mpd
index 77db1edc..2617eada 100644
--- a/templates/sle.mpd
+++ b/templates/sle.mpd
@@ -22,7 +22,7 @@
 				RunFromDir="%rw">
 				<Exec
 					CmdLine='g++ -c %xup -g -o "%bd%n%oe" %i "%f" %~other'
-                                        OtherOptions="-W -Wall -Wpointer-arith -mcpu=pentiumpro -mthreads -pipe -fno-exceptions -fcheck-new <%foreach(includes)%>-I"<%include%>" <%endfor%><%foreach(defines common_defines macros)%>-D<%define%> <%endfor%><%if(type_is_dynamic)%><%foreach(dynamicflags)%>-D <%dynamicflag%> <%endfor%><%endif%><%if(need_staticflags)%><%foreach(staticflags)%>-D <%staticflag%> <%endfor%><%endif%>"/>
+                                        OtherOptions="-W -Wall -Wpointer-arith -mcpu=pentiumpro -mthreads -pipe -fno-exceptions -fcheck-new <%foreach(includes)%>-I'<%include%>' <%endfor%><%foreach(defines common_defines macros)%>-D<%define%> <%endfor%><%if(type_is_dynamic)%><%foreach(dynamicflags)%>-D <%dynamicflag%> <%endfor%><%endif%><%if(need_staticflags)%><%foreach(staticflags)%>-D <%staticflag%> <%endfor%><%endif%>"/>
 			</Target>
 			<Target
 				Name="Link"
@@ -35,7 +35,7 @@
 				RunFromDir="%rw">
 				<Exec
 					CmdLine='g++ %xup -g -o "%o" %f %libs %~other'
-                                        OtherOptions="-Wl,--enable-auto-import -Wl,-E -lws2_32 -lmswsock -lwsock32 -lnetapi32 <%foreach(pure_libs)%>-l<%pure_lib%> <%endfor%><%foreach(lit_libs)%>-l<%lit_lib%>.lib <%endfor%><%foreach(libs)%>-l<%lib%><%lib_modifier%>.lib <%endfor%><%foreach(libpaths)%>-L"<%libpath%>" <%endfor%>"/>
+                                        OtherOptions="-Wl,--enable-auto-import -Wl,-E -lws2_32 -lmswsock -lwsock32 -lnetapi32 <%foreach(pure_libs)%>-l<%pure_lib%> <%endfor%><%foreach(lit_libs)%>-l<%lit_lib%>.lib <%endfor%><%foreach(libs)%>-l<%lib%><%lib_modifier%>.lib <%endfor%><%foreach(libpaths)%>-L'<%libpath%>' <%endfor%>"/>
 			</Target>
 			<Target
 				Name="Build"
@@ -117,7 +117,7 @@
 				RunFromDir="%rw">
 				<Exec
 					CmdLine='g++ -c %xup -o "%bd%n%oe" %i "%f" %~other'
-                                        OtherOptions="-W -Wall -Wpointer-arith -mcpu=pentiumpro -mthreads -pipe -fno-exceptions -fcheck-new <%foreach(includes)%>-I"<%include%>" <%endfor%><%foreach(defines common_defines macros)%>-D<%define%> <%endfor%><%if(type_is_dynamic)%><%foreach(dynamicflags)%>-D <%dynamicflag%> <%endfor%><%endif%><%if(need_staticflags)%><%foreach(staticflags)%>-D <%staticflag%> <%endfor%><%endif%>"/>
+                                        OtherOptions="-W -Wall -Wpointer-arith -mcpu=pentiumpro -mthreads -pipe -fno-exceptions -fcheck-new <%foreach(includes)%>-I'<%include%>' <%endfor%><%foreach(defines common_defines macros)%>-D<%define%> <%endfor%><%if(type_is_dynamic)%><%foreach(dynamicflags)%>-D <%dynamicflag%> <%endfor%><%endif%><%if(need_staticflags)%><%foreach(staticflags)%>-D <%staticflag%> <%endfor%><%endif%>"/>
 			</Target>
 			<Target
 				Name="Link"
@@ -130,7 +130,7 @@
 				RunFromDir="%rw">
 				<Exec
 					CmdLine='g++ %xup -o "%o" %f %libs %~other'
-                                        OtherOptions="-Wl,--enable-auto-import -Wl,-E -lws2_32 -lmswsock -lwsock32 -lnetapi32 <%foreach(pure_libs)%>-l<%pure_lib%> <%endfor%><%foreach(lit_libs)%>-l<%lit_lib%>.lib <%endfor%><%foreach(libs)%>-l<%lib%><%lib_modifier%>.lib <%endfor%><%foreach(libpaths)%>-L"<%libpath%>" <%endfor%>"/>
+                                        OtherOptions="-Wl,--enable-auto-import -Wl,-E -lws2_32 -lmswsock -lwsock32 -lnetapi32 <%foreach(pure_libs)%>-l<%pure_lib%> <%endfor%><%foreach(lit_libs)%>-l<%lit_lib%>.lib <%endfor%><%foreach(libs)%>-l<%lib%><%lib_modifier%>.lib <%endfor%><%foreach(libpaths)%>-L'<%libpath%>' <%endfor%>"/>
 			</Target>
 			<Target
 				Name="Build"