Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Niefer2007-07-09 15:58:22 -0400
committerAndrew Niefer2007-07-09 15:58:22 -0400
commitb777c31bdfc6e008d96f730b83c8b735f7f7461e (patch)
treec4f86612e38af0ad0000131ebc1593d05a2ec4a7 /bundles/org.eclipse.equinox.executable/library/win32/make_mingw.mak
parent1cab4516b366959c29060da2415d7722ebf97757 (diff)
downloadrt.equinox.framework-b777c31bdfc6e008d96f730b83c8b735f7f7461e.tar.gz
rt.equinox.framework-b777c31bdfc6e008d96f730b83c8b735f7f7461e.tar.xz
rt.equinox.framework-b777c31bdfc6e008d96f730b83c8b735f7f7461e.zip
bug 195811
Diffstat (limited to 'bundles/org.eclipse.equinox.executable/library/win32/make_mingw.mak')
-rw-r--r--bundles/org.eclipse.equinox.executable/library/win32/make_mingw.mak10
1 files changed, 7 insertions, 3 deletions
diff --git a/bundles/org.eclipse.equinox.executable/library/win32/make_mingw.mak b/bundles/org.eclipse.equinox.executable/library/win32/make_mingw.mak
index cd810365b..b938a6c89 100644
--- a/bundles/org.eclipse.equinox.executable/library/win32/make_mingw.mak
+++ b/bundles/org.eclipse.equinox.executable/library/win32/make_mingw.mak
@@ -26,6 +26,10 @@ include ../make_version.mak
ifeq ($(PROGRAM_OUTPUT),)
PROGRAM_OUTPUT=eclipse.exe
endif
+
+# Separate filename from extention
+PROGRAM_NAME=$(PROGRAM_OUTPUT:.exe=)
+
PROGRAM_LIBRARY=eclipse_$(LIB_VERSION).dll
# Allow for cross-compiling under linux
@@ -58,8 +62,8 @@ LIBS = -lkernel32 -luser32 -lgdi32 -lcomctl32 -lmsvcrt -lversion
LDFLAGS = -mwindows -mno-cygwin
CONSOLEFLAGS = -mconsole -mno-cygwin
DLL_LDFLAGS = -mno-cygwin -shared -Wl,--export-all-symbols -Wl,--kill-at
-RES = eclipse.res
-CONSOLE = eclipsec.exe
+RES = $(PROGRAM_NAME).res
+CONSOLE = $(PROGRAM_NAME)c.exe
EXEC = $(PROGRAM_OUTPUT)
DLL = $(PROGRAM_LIBRARY)
DEBUG = $(CDEBUG)
@@ -130,7 +134,7 @@ aeclipseWin.o: ../eclipseOS.h ../eclipseUnicode.h eclipseWin.c
aeclipseJNI.o: ../eclipseUnicode.h ../eclipseJNI.c
$(CC) $(DEBUG) $(ACFLAGS) -c -o $@ ../eclipseJNI.c
-$(RES): eclipse.rc
+$(RES): $(PROGRAM_NAME).rc
$(RC) --output-format=coff --include-dir=.. -o $@ $<
$(EXEC): $(MAIN_OBJS) $(COMMON_OBJS) $(RES)

Back to the top