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/wpf
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/wpf')
-rw-r--r--bundles/org.eclipse.equinox.executable/library/wpf/make_wpf.mak11
1 files changed, 7 insertions, 4 deletions
diff --git a/bundles/org.eclipse.equinox.executable/library/wpf/make_wpf.mak b/bundles/org.eclipse.equinox.executable/library/wpf/make_wpf.mak
index 2afca3cab..689f78e63 100644
--- a/bundles/org.eclipse.equinox.executable/library/wpf/make_wpf.mak
+++ b/bundles/org.eclipse.equinox.executable/library/wpf/make_wpf.mak
@@ -24,6 +24,9 @@ NODEBUG=1
!include <..\make_version.mak>
PROGRAM_LIBRARY = eclipse_$(LIB_VERSION).dll
+PROGRAM_OUTPUT=eclipse.exe
+# Separate filename from extention
+PROGRAM_NAME=$(PROGRAM_OUTPUT:.exe=)
# Define the object modules to be compiled and flags.
MAIN_OBJS = eclipseMain.obj
@@ -35,9 +38,9 @@ DLL_LIBS = kernel32.lib Advapi32.lib msvcrt.lib version.lib
LFLAGS = -CLRTHREADATTRIBUTE:STA /NODEFAULTLIB:LIBCMT /INCREMENTAL:NO /RELEASE /NOLOGO -subsystem:windows,4.0 -entry:wmainCRTStartup
CONSOLEFLAGS = -CLRTHREADATTRIBUTE:STA /NODEFAULTLIB:LIBCMT /INCREMENTAL:NO /RELEASE /NOLOGO -subsystem:console,4.0 -entry:wmainCRTStartup
DLL_LFLAGS = -CLRTHREADATTRIBUTE:STA /NODEFAULTLIB:LIBCMT /INCREMENTAL:NO /PDB:NONE -dll /BASE:0x10000000 /DLL
-RES = eclipse.res
-EXEC = eclipse.exe
-CONSOLE = eclipsec.exe
+RES = $(PROGRAM_NAME).res
+EXEC = $(PROGRAM_OUTPUT)
+CONSOLE = $(PROGRAM_NAME)c.exe
DLL = $(PROGRAM_LIBRARY)
DEBUG = #$(cdebug)
@@ -82,7 +85,7 @@ eclipseShm.obj: ../eclipseShm.h ../eclipseUnicode.h ../eclipseShm.c
$(CC) $(DEBUG) $(CFLAGS) $(cvarsdll) /Fo$*.obj ../eclipseShm.c
$(EXEC): $(MAIN_OBJS) $(COMMON_OBJS)
- rc.exe -r -fo $(RES) eclipse.rc
+ rc.exe -r -fo $(RES) $(PROGRAM_NAME).rc
link $(LFLAGS) -out:$(PROGRAM_OUTPUT) $(MAIN_OBJS) $(COMMON_OBJS) $(RES) $(LIBS)
mt.exe -manifest $(PROGRAM_OUTPUT).manifest -outputresource:$(PROGRAM_OUTPUT);2

Back to the top