diff options
author | Sravan Kumar Lakkimsetti | 2018-01-18 12:04:30 +0000 |
---|---|---|
committer | Sravan Kumar Lakkimsetti | 2018-01-18 12:05:58 +0000 |
commit | 564c3f3643e85988ca2e7d6a649eb04378d24956 (patch) | |
tree | 5a31c4d5366bdde812767c22a70906788cddce21 | |
parent | 17fa12cc18a60dbe283b47f40f8ead6ea96bc3c8 (diff) | |
download | rt.equinox.framework-564c3f3643e85988ca2e7d6a649eb04378d24956.tar.gz rt.equinox.framework-564c3f3643e85988ca2e7d6a649eb04378d24956.tar.xz rt.equinox.framework-564c3f3643e85988ca2e7d6a649eb04378d24956.zip |
Bug 528229 - Build launcher on Eclipse Foundation Infra
Change-Id: I19d93468be6033d41424155ba6413248ead5af99
Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
-rw-r--r-- | features/org.eclipse.equinox.executable.feature/library/win32/make_win32.mak | 30 | ||||
-rw-r--r-- | features/org.eclipse.equinox.executable.feature/library/win32/make_win64.mak | 30 |
2 files changed, 30 insertions, 30 deletions
diff --git a/features/org.eclipse.equinox.executable.feature/library/win32/make_win32.mak b/features/org.eclipse.equinox.executable.feature/library/win32/make_win32.mak index 24add7e8d..d3a9926fe 100644 --- a/features/org.eclipse.equinox.executable.feature/library/win32/make_win32.mak +++ b/features/org.eclipse.equinox.executable.feature/library/win32/make_win32.mak @@ -35,11 +35,11 @@ MAIN_OBJS = eclipseMain.obj COMMON_OBJS = eclipseConfig.obj eclipseCommon.obj eclipseWinCommon.obj DLL_OBJS = eclipse.obj eclipseWin.obj eclipseUtil.obj eclipseJNI.obj eclipseShm.obj -LIBS = kernel32.lib user32.lib comctl32.lib msvcrt.lib -DLL_LIBS = kernel32.lib user32.lib comctl32.lib gdi32.lib Advapi32.lib msvcrt.lib version.lib -LFLAGS = /NODEFAULTLIB /INCREMENTAL:NO /LARGEADDRESSAWARE /MT /RELEASE /NOLOGO -subsystem:windows,4.0 -entry:wmainCRTStartup -CONSOLEFLAGS = /NODEFAULTLIB /INCREMENTAL:NO /LARGEADDRESSAWARE /MT /RELEASE /NOLOGO -subsystem:console,4.0 -entry:wmainCRTStartup -DLL_LFLAGS = /NODEFAULTLIB /INCREMENTAL:NO /LARGEADDRESSAWARE /PDB:NONE /MT /RELEASE /NOLOGO -entry:_DllMainCRTStartup@12 -dll /BASE:0x72000000 /DLL +LIBS = kernel32.lib user32.lib comctl32.lib libcmt.lib +DLL_LIBS = kernel32.lib user32.lib comctl32.lib gdi32.lib Advapi32.lib libcmt.lib version.lib +LFLAGS = /NODEFAULTLIB /INCREMENTAL:NO /LARGEADDRESSAWARE /RELEASE /NOLOGO -subsystem:windows,4.0 -entry:wmainCRTStartup +CONSOLEFLAGS = /NODEFAULTLIB /INCREMENTAL:NO /LARGEADDRESSAWARE /RELEASE /NOLOGO -subsystem:console,4.0 -entry:wmainCRTStartup +DLL_LFLAGS = /NODEFAULTLIB /INCREMENTAL:NO /LARGEADDRESSAWARE /PDB:NONE /RELEASE /NOLOGO -entry:_DllMainCRTStartup@12 -dll /BASE:0x72000000 /DLL RES = $(PROGRAM_NAME).res EXEC = $(PROGRAM_OUTPUT) CONSOLE = $(PROGRAM_NAME)c.exe @@ -54,31 +54,31 @@ wcflags = -DUNICODE -I.. -DDEFAULT_OS="\"$(DEFAULT_OS)\"" \ all: $(EXEC) $(DLL) $(CONSOLE) eclipseMain.obj: ../eclipseUnicode.h ../eclipseCommon.h ../eclipseMain.c - $(cc) $(DEBUG) $(wcflags) $(cvarsdll) /Fo$*.obj ../eclipseMain.c + $(cc) $(DEBUG) $(wcflags) $(cvarsmt) /Fo$*.obj ../eclipseMain.c eclipseCommon.obj: ../eclipseCommon.h ../eclipseUnicode.h ../eclipseCommon.c - $(cc) $(DEBUG) $(wcflags) $(cvarsdll) /Fo$*.obj ../eclipseCommon.c + $(cc) $(DEBUG) $(wcflags) $(cvarsmt) /Fo$*.obj ../eclipseCommon.c eclipse.obj: ../eclipseOS.h ../eclipseUnicode.h ../eclipse.c - $(cc) $(DEBUG) $(wcflags) $(cvarsdll) /Fo$*.obj ../eclipse.c + $(cc) $(DEBUG) $(wcflags) $(cvarsmt) /Fo$*.obj ../eclipse.c eclipseUtil.obj: ../eclipseUtil.h ../eclipseUnicode.h ../eclipseUtil.c - $(cc) $(DEBUG) $(wcflags) $(cvarsdll) /Fo$*.obj ../eclipseUtil.c + $(cc) $(DEBUG) $(wcflags) $(cvarsmt) /Fo$*.obj ../eclipseUtil.c eclipseConfig.obj: ../eclipseConfig.h ../eclipseUnicode.h ../eclipseConfig.c - $(cc) $(DEBUG) $(wcflags) $(cvarsdll) /Fo$*.obj ../eclipseConfig.c + $(cc) $(DEBUG) $(wcflags) $(cvarsmt) /Fo$*.obj ../eclipseConfig.c eclipseWin.obj: ../eclipseOS.h ../eclipseUnicode.h eclipseWin.c - $(cc) $(DEBUG) $(wcflags) $(cvarsdll) /Fo$*.obj eclipseWin.c + $(cc) $(DEBUG) $(wcflags) $(cvarsmt) /Fo$*.obj eclipseWin.c eclipseWinCommon.obj: ../eclipseCommon.h eclipseWinCommon.c - $(cc) $(DEBUG) $(wcflags) $(cvarsdll) /Fo$*.obj eclipseWinCommon.c + $(cc) $(DEBUG) $(wcflags) $(cvarsmt) /Fo$*.obj eclipseWinCommon.c eclipseJNI.obj: ../eclipseCommon.h ../eclipseOS.h ../eclipseJNI.c - $(CC) $(DEBUG) $(wcflags) $(cvarsdll) /Fo$*.obj ../eclipseJNI.c + $(CC) $(DEBUG) $(wcflags) $(cvarsmt) /Fo$*.obj ../eclipseJNI.c eclipseShm.obj: ../eclipseShm.h ../eclipseUnicode.h ../eclipseShm.c - $(CC) $(DEBUG) $(wcflags) $(cvarsdll) /Fo$*.obj ../eclipseShm.c + $(CC) $(DEBUG) $(wcflags) $(cvarsmt) /Fo$*.obj ../eclipseShm.c $(EXEC): $(MAIN_OBJS) $(COMMON_OBJS) $(RES) $(link) $(LFLAGS) -out:$(PROGRAM_OUTPUT) $(MAIN_OBJS) $(COMMON_OBJS) $(RES) $(LIBS) @@ -86,7 +86,7 @@ $(EXEC): $(MAIN_OBJS) $(COMMON_OBJS) $(RES) #the console version needs a flag set, should look for a better way to do this $(CONSOLE): $(MAIN_OBJS) $(COMMON_OBJS) del -f eclipseConfig.obj aeclipseConfig.obj - $(cc) $(DEBUG) $(wcflags) $(cvarsdll) -D_WIN32_CONSOLE /FoeclipseConfig.obj ../eclipseConfig.c + $(cc) $(DEBUG) $(wcflags) $(cvarsmt) -D_WIN32_CONSOLE /FoeclipseConfig.obj ../eclipseConfig.c $(link) $(CONSOLEFLAGS) -out:$(CONSOLE) $(MAIN_OBJS) $(COMMON_OBJS) $(LIBS) $(DLL): $(DLL_OBJS) $(COMMON_OBJS) diff --git a/features/org.eclipse.equinox.executable.feature/library/win32/make_win64.mak b/features/org.eclipse.equinox.executable.feature/library/win32/make_win64.mak index 4f4ed3997..a2b0309de 100644 --- a/features/org.eclipse.equinox.executable.feature/library/win32/make_win64.mak +++ b/features/org.eclipse.equinox.executable.feature/library/win32/make_win64.mak @@ -39,12 +39,12 @@ MAIN_OBJS = eclipseMain.obj COMMON_OBJS = eclipseConfig.obj eclipseCommon.obj eclipseWinCommon.obj DLL_OBJS = eclipse.obj eclipseWin.obj eclipseUtil.obj eclipseJNI.obj eclipseShm.obj -LIBS = kernel32.lib user32.lib comctl32.lib msvcrt.lib bufferoverflowU.lib -DLL_LIBS = kernel32.lib user32.lib comctl32.lib gdi32.lib Advapi32.lib msvcrt.lib version.lib bufferoverflowU.lib -LFLAGS = /NODEFAULTLIB /INCREMENTAL:NO /MT /RELEASE /NOLOGO -subsystem:windows -entry:wmainCRTStartup -CONSOLEFLAGS = /NODEFAULTLIB /INCREMENTAL:NO /RELEASE /MT /NOLOGO -subsystem:console -entry:wmainCRTStartup +LIBS = kernel32.lib user32.lib comctl32.lib libcmt.lib bufferoverflowU.lib +DLL_LIBS = kernel32.lib user32.lib comctl32.lib gdi32.lib Advapi32.lib libcmt.lib version.lib bufferoverflowU.lib +LFLAGS = /NODEFAULTLIB /INCREMENTAL:NO /RELEASE /NOLOGO -subsystem:windows -entry:wmainCRTStartup +CONSOLEFLAGS = /NODEFAULTLIB /INCREMENTAL:NO /RELEASE /NOLOGO -subsystem:console -entry:wmainCRTStartup #DLL_LFLAGS = /NODEFAULTLIB /INCREMENTAL:NO /PDB:NONE /RELEASE /NOLOGO -entry:_DllMainCRTStartup@12 -dll /BASE:0x72000000 /DLL -DLL_LFLAGS = /NODEFAULTLIB /INCREMENTAL:NO /PDB:NONE /MT /RELEASE /NOLOGO -dll /BASE:0x72000000 /DLL +DLL_LFLAGS = /NODEFAULTLIB /INCREMENTAL:NO /PDB:NONE /RELEASE /NOLOGO -dll /BASE:0x72000000 /DLL RES = $(PROGRAM_NAME).res EXEC = $(PROGRAM_OUTPUT) CONSOLE = $(PROGRAM_NAME)c.exe @@ -58,31 +58,31 @@ wcflags = -DUNICODE -I.. -DDEFAULT_OS="\"$(DEFAULT_OS)\"" \ all: $(EXEC) $(DLL) $(CONSOLE) eclipseMain.obj: ../eclipseUnicode.h ../eclipseCommon.h ../eclipseMain.c - $(cc) $(DEBUG) $(wcflags) $(cvarsdll) /Fo$*.obj ../eclipseMain.c + $(cc) $(DEBUG) $(wcflags) $(cvarsmt) /Fo$*.obj ../eclipseMain.c eclipseCommon.obj: ../eclipseCommon.h ../eclipseUnicode.h ../eclipseCommon.c - $(cc) $(DEBUG) $(wcflags) $(cvarsdll) /Fo$*.obj ../eclipseCommon.c + $(cc) $(DEBUG) $(wcflags) $(cvarsmt) /Fo$*.obj ../eclipseCommon.c eclipse.obj: ../eclipseOS.h ../eclipseUnicode.h ../eclipse.c - $(cc) $(DEBUG) $(wcflags) $(cvarsdll) /Fo$*.obj ../eclipse.c + $(cc) $(DEBUG) $(wcflags) $(cvarsmt) /Fo$*.obj ../eclipse.c eclipseUtil.obj: ../eclipseUtil.h ../eclipseUnicode.h ../eclipseUtil.c - $(cc) $(DEBUG) $(wcflags) $(cvarsdll) /Fo$*.obj ../eclipseUtil.c + $(cc) $(DEBUG) $(wcflags) $(cvarsmt) /Fo$*.obj ../eclipseUtil.c eclipseConfig.obj: ../eclipseConfig.h ../eclipseUnicode.h ../eclipseConfig.c - $(cc) $(DEBUG) $(wcflags) $(cvarsdll) /Fo$*.obj ../eclipseConfig.c + $(cc) $(DEBUG) $(wcflags) $(cvarsmt) /Fo$*.obj ../eclipseConfig.c eclipseWin.obj: ../eclipseOS.h ../eclipseUnicode.h eclipseWin.c - $(cc) $(DEBUG) $(wcflags) $(cvarsdll) /Fo$*.obj eclipseWin.c + $(cc) $(DEBUG) $(wcflags) $(cvarsmt) /Fo$*.obj eclipseWin.c eclipseWinCommon.obj: ../eclipseCommon.h eclipseWinCommon.c - $(cc) $(DEBUG) $(wcflags) $(cvarsdll) /Fo$*.obj eclipseWinCommon.c + $(cc) $(DEBUG) $(wcflags) $(cvarsmt) /Fo$*.obj eclipseWinCommon.c eclipseJNI.obj: ../eclipseCommon.h ../eclipseOS.h ../eclipseJNI.c - $(CC) $(DEBUG) $(wcflags) $(cvarsdll) /Fo$*.obj ../eclipseJNI.c + $(CC) $(DEBUG) $(wcflags) $(cvarsmt) /Fo$*.obj ../eclipseJNI.c eclipseShm.obj: ../eclipseShm.h ../eclipseUnicode.h ../eclipseShm.c - $(CC) $(DEBUG) $(wcflags) $(cvarsdll) /Fo$*.obj ../eclipseShm.c + $(CC) $(DEBUG) $(wcflags) $(cvarsmt) /Fo$*.obj ../eclipseShm.c $(EXEC): $(MAIN_OBJS) $(COMMON_OBJS) $(RES) $(link) $(LFLAGS) -out:$(PROGRAM_OUTPUT) $(MAIN_OBJS) $(COMMON_OBJS) $(RES) $(LIBS) @@ -90,7 +90,7 @@ $(EXEC): $(MAIN_OBJS) $(COMMON_OBJS) $(RES) #the console version needs a flag set, should look for a better way to do this $(CONSOLE): $(MAIN_OBJS) $(COMMON_OBJS) del -f eclipseConfig.obj aeclipseConfig.obj - $(cc) $(DEBUG) $(wcflags) $(cvarsdll) -D_WIN32_CONSOLE /FoeclipseConfig.obj ../eclipseConfig.c + $(cc) $(DEBUG) $(wcflags) $(cvarsmt) -D_WIN32_CONSOLE /FoeclipseConfig.obj ../eclipseConfig.c $(link) $(CONSOLEFLAGS) -out:$(CONSOLE) $(MAIN_OBJS) $(COMMON_OBJS) $(LIBS) $(DLL): $(DLL_OBJS) $(COMMON_OBJS) |