diff options
author | Andrew Niefer | 2007-07-09 19:58:22 +0000 |
---|---|---|
committer | Andrew Niefer | 2007-07-09 19:58:22 +0000 |
commit | b777c31bdfc6e008d96f730b83c8b735f7f7461e (patch) | |
tree | c4f86612e38af0ad0000131ebc1593d05a2ec4a7 /bundles | |
parent | 1cab4516b366959c29060da2415d7722ebf97757 (diff) | |
download | rt.equinox.framework-b777c31bdfc6e008d96f730b83c8b735f7f7461e.tar.gz rt.equinox.framework-b777c31bdfc6e008d96f730b83c8b735f7f7461e.tar.xz rt.equinox.framework-b777c31bdfc6e008d96f730b83c8b735f7f7461e.zip |
bug 195811
Diffstat (limited to 'bundles')
3 files changed, 22 insertions, 11 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) diff --git a/bundles/org.eclipse.equinox.executable/library/win32/make_win32.mak b/bundles/org.eclipse.equinox.executable/library/win32/make_win32.mak index b12bfe148..c419e9188 100644 --- a/bundles/org.eclipse.equinox.executable/library/win32/make_win32.mak +++ b/bundles/org.eclipse.equinox.executable/library/win32/make_win32.mak @@ -24,6 +24,10 @@ NODEBUG=1 !include <ntwin32.mak> !include <..\make_version.mak> +PROGRAM_OUTPUT=eclipse.exe +# Separate filename from extention +PROGRAM_NAME=$(PROGRAM_OUTPUT:.exe=) + PROGRAM_LIBRARY = eclipse_$(LIB_VERSION).dll # Define the object modules to be compiled and flags. @@ -38,9 +42,9 @@ DLL_LIBS = kernel32.lib user32.lib comctl32.lib gdi32.lib Advapi32.lib msvcrt.li LFLAGS = /NODEFAULTLIB /INCREMENTAL:NO /RELEASE /NOLOGO -subsystem:windows,4.0 -entry:wmainCRTStartup CONSOLEFLAGS = /NODEFAULTLIB /INCREMENTAL:NO /RELEASE /NOLOGO -subsystem:console,4.0 -entry:wmainCRTStartup DLL_LFLAGS = /NODEFAULTLIB /INCREMENTAL:NO /PDB:NONE /RELEASE /NOLOGO -entry:_DllMainCRTStartup@12 -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) acflags = -I.. -DDEFAULT_OS="\"$(DEFAULT_OS)\"" \ @@ -118,7 +122,7 @@ $(CONSOLE): $(MAIN_OBJS) $(COMMON_OBJS) $(DLL): $(DLL_OBJS) $(COMMON_OBJS) $(link) $(DLL_LFLAGS) -out:$(PROGRAM_LIBRARY) $(DLL_OBJS) $(COMMON_OBJS) $(DLL_LIBS) -$(RES): eclipse.rc +$(RES): $(PROGRAM_NAME).rc $(rc) -r -fo $(RES) eclipse.rc install: all 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 |