From 73e5313e1c1aaa4ae864aea97334a08a09e92cb6 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Sun, 30 Aug 2015 10:58:07 -0600 Subject: [PATCH] fix starter icons for Windows cross-compile --- racket/src/racket/Makefile.in | 5 ----- racket/src/racket/dynsrc/Makefile.in | 8 +++++--- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/racket/src/racket/Makefile.in b/racket/src/racket/Makefile.in index 1efdba7a87..91bb9d6645 100644 --- a/racket/src/racket/Makefile.in +++ b/racket/src/racket/Makefile.in @@ -280,11 +280,6 @@ ee-main: ee-app: $(RACKET) main_ee.@LTO@ if [ "$(EEAPP)" = '' ] ; then echo "ERROR: You must specify EEAPP" ; else $(CC) $(MAIN_CFLAGS_NODBG) -o $(EEAPP) main_ee.@LTO@ $(EEOBJECTS) $(SPECIALIZINGOBJECTS) libracket.@LIBSFX@ libmzgc.@LIBSFX@ @LIBS@ ; fi -mzstart.exe: $(srcdir)/dynsrc/start.c - $(CC) $(CFLAGS) $(CPPFLAGS) -o mzstart.exe $(srcdir)/dynsrc/start.c - -starter: mzstart.exe - MZCOM_DEPS = $(MAIN_HEADER_DEPS) $(srcdir)/../mzcom/com_glue.h $(srcdir)/../mzcom/resource.h mzcom.@LTO@: $(srcdir)/../mzcom/mzcom.cxx $(MZCOM_DEPS) diff --git a/racket/src/racket/dynsrc/Makefile.in b/racket/src/racket/dynsrc/Makefile.in index 5c88395a92..2fbfa887dd 100644 --- a/racket/src/racket/dynsrc/Makefile.in +++ b/racket/src/racket/dynsrc/Makefile.in @@ -57,11 +57,13 @@ dynexmpl.o: $(srcdir)/dynexmpl.c $(HEADERS) ../starter@MINGW@@EXE_SUFFIX@: $(srcdir)/start.c ../mrstarter@EXE_SUFFIX@ sres.o $(PLAIN_CC) $(ALL_CFLAGS) -o ../starter@EXE_SUFFIX@ $(srcdir)/start.c sres.o -../mrstarter@EXE_SUFFIX@: sres.o - $(PLAIN_CC) $(ALL_CFLAGS) -mwindows -DMRSTART -o ../mrstarter@EXE_SUFFIX@ $(srcdir)/start.c sres.o +../mrstarter@EXE_SUFFIX@: smrres.o + $(PLAIN_CC) $(ALL_CFLAGS) -mwindows -DMRSTART -o ../mrstarter@EXE_SUFFIX@ $(srcdir)/start.c smrres.o sres.o: - @WINDRES@ -i $(srcdir)/../../worksp/starters/start.rc -o sres.o + @WINDRES@ -DMZSTART -i $(srcdir)/../../worksp/starters/start.rc -o sres.o +smrres.o: + @WINDRES@ -DMRSTART -i $(srcdir)/../../worksp/starters/start.rc -o smrres.o # Cygwin ########################################