diff --git a/tools/.cvsignore b/tools/.cvsignore index 98949f10f7e..a594a18c9e4 100644 --- a/tools/.cvsignore +++ b/tools/.cvsignore @@ -2,5 +2,5 @@ Makefile bin2res fnt2bdf makedep -mingwrap +winegcc winewrap diff --git a/tools/Makefile.in b/tools/Makefile.in index a839336574e..8e3607c85d6 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -9,14 +9,14 @@ PROGRAMS = \ bin2res \ fnt2bdf \ makedep \ - mingwrap \ + winegcc \ winewrap C_SRCS = \ bin2res.c \ fnt2bdf.c \ makedep.c \ - mingwrap.c \ + winegcc.c \ winewrap.c SUBDIRS = \ @@ -48,8 +48,8 @@ fnt2bdf: fnt2bdf.o bin2res: bin2res.o $(CC) $(CFLAGS) -o bin2res bin2res.o -mingwrap: mingwrap.o - $(CC) $(CFLAGS) -o mingwrap mingwrap.o +winegcc: winegcc.o + $(CC) $(CFLAGS) -o winegcc winegcc.o winewrap: winewrap.o $(CC) $(CFLAGS) -o winewrap winewrap.o @@ -57,11 +57,11 @@ winewrap: winewrap.o install:: $(MKINSTALLDIRS) $(bindir) $(mandir)/man$(prog_manext) $(INSTALL_SCRIPT) $(SRCDIR)/winemaker $(bindir)/winemaker - $(INSTALL_PROGRAM) mingwrap $(bindir)/mingwrap + $(INSTALL_PROGRAM) winegcc $(bindir)/winegcc $(INSTALL_PROGRAM) winewrap $(bindir)/winewrap $(INSTALL_DATA) $(SRCDIR)/winemaker.man $(mandir)/man$(prog_manext)/winemaker.$(prog_manext) uninstall:: - $(RM) $(bindir)/winemaker $(bindir)/mingwrap $(bindir)/winewrap $(mandir)/man$(prog_manext)/winemaker.$(prog_manext) + $(RM) $(bindir)/winemaker $(bindir)/winegcc $(bindir)/winewrap $(mandir)/man$(prog_manext)/winemaker.$(prog_manext) ### Dependencies: diff --git a/tools/mingwrap.c b/tools/winegcc.c similarity index 98% rename from tools/mingwrap.c rename to tools/winegcc.c index 2358f15c34a..77753024b38 100644 --- a/tools/mingwrap.c +++ b/tools/winegcc.c @@ -124,7 +124,6 @@ int main(int argc, char **argv) { if (use_msvcrt) gcc_argv[i++] = "-I" INCLUDEDIR "/msvcrt"; gcc_argv[i++] = "-I" INCLUDEDIR "/windows"; - gcc_argv[i++] = "-DWINE_DEFINE_WCHAR_T"; } gcc_argv[i++] = "-D__int8=char"; gcc_argv[i++] = "-D__int16=short";