winegcc: behave like g++ when invoked as wineg++
Dimitrie O. Paun
dpaun at rogers.com
Sun Jan 5 22:47:06 CST 2003
ChangeLog
Create a wineg++ akin to g++. Drop support for the abused -xc++ switched.
Index: tools/Makefile.in
===================================================================
RCS file: /var/cvs/wine/tools/Makefile.in,v
retrieving revision 1.30
diff -u -r1.30 Makefile.in
--- tools/Makefile.in 19 Dec 2002 23:41:30 -0000 1.30
+++ tools/Makefile.in 6 Jan 2003 00:35:30 -0000
@@ -58,10 +58,11 @@
$(MKINSTALLDIRS) $(bindir) $(mandir)/man$(prog_manext)
$(INSTALL_SCRIPT) $(SRCDIR)/winemaker $(bindir)/winemaker
$(INSTALL_PROGRAM) winegcc $(bindir)/winegcc
+ $(LN_S) $(bindir)/winegcc $(bindir)/wineg++
$(INSTALL_PROGRAM) winewrap $(bindir)/winewrap
$(INSTALL_DATA) $(SRCDIR)/winemaker.man $(mandir)/man$(prog_manext)/winemaker.$(prog_manext)
uninstall::
- $(RM) $(bindir)/winemaker $(bindir)/winegcc $(bindir)/winewrap $(mandir)/man$(prog_manext)/winemaker.$(prog_manext)
+ $(RM) $(bindir)/winemaker $(bindir)/winegcc $(bindir)/wineg++ $(bindir)/winewrap $(mandir)/man$(prog_manext)/winemaker.$(prog_manext)
### Dependencies:
Index: tools/winegcc.c
===================================================================
RCS file: /var/cvs/wine/tools/winegcc.c,v
retrieving revision 1.7
diff -u -r1.7 winegcc.c
--- tools/winegcc.c 5 Jan 2003 20:28:54 -0000 1.7
+++ tools/winegcc.c 6 Jan 2003 04:06:59 -0000
@@ -45,10 +45,16 @@
int main(int argc, char **argv)
{
char **gcc_argv;
- int i, j;
+ int i, j, l;
int linking = 1, verbose = 0, cpp = 0, use_static_linking = 0;
int use_stdinc = 1, use_stdlib = 1, use_msvcrt = 0, gui_app = 0;
+ if (argc > 0 && argv[0])
+ {
+ l = strlen(argv[0]);
+ if (l > 2 && argv[0][l-1] == '+' && argv[0][l-2] == '+') cpp = 1;
+ }
+
for ( i = 1 ; i < argc ; i++ )
{
if (argv[i][0] == '-') /* option */
@@ -94,9 +100,6 @@
use_static_linking = 1;
}
break;
- case 'x':
- if (strcmp("-xc++", argv[i]) == 0) cpp = 1;
- break;
case '-':
if (strcmp("-static", argv[i]+1) == 0)
use_static_linking = 1;
--
Dimi.
More information about the wine-patches
mailing list