diff options
author | Andrew Niefer | 2009-10-06 18:42:49 +0000 |
---|---|---|
committer | Andrew Niefer | 2009-10-06 18:42:49 +0000 |
commit | 9ffafc45f7a2bf838733d2317d50c6455ef8b5dc (patch) | |
tree | 4e264ac1fdbbe735c82e95e1427d01e28b375f57 /bundles/org.eclipse.equinox.executable/library/win32/make_win64.mak | |
parent | 5611a9970e1942135a413f6244473f8ea5094fbe (diff) | |
download | rt.equinox.framework-9ffafc45f7a2bf838733d2317d50c6455ef8b5dc.tar.gz rt.equinox.framework-9ffafc45f7a2bf838733d2317d50c6455ef8b5dc.tar.xz rt.equinox.framework-9ffafc45f7a2bf838733d2317d50c6455ef8b5dc.zip |
bug 289138 - Remove dual ANSI/UNICODE on windows
Diffstat (limited to 'bundles/org.eclipse.equinox.executable/library/win32/make_win64.mak')
-rw-r--r-- | bundles/org.eclipse.equinox.executable/library/win32/make_win64.mak | 41 |
1 files changed, 5 insertions, 36 deletions
diff --git a/bundles/org.eclipse.equinox.executable/library/win32/make_win64.mak b/bundles/org.eclipse.equinox.executable/library/win32/make_win64.mak index f009b00e7..f1faaabca 100644 --- a/bundles/org.eclipse.equinox.executable/library/win32/make_win64.mak +++ b/bundles/org.eclipse.equinox.executable/library/win32/make_win64.mak @@ -1,5 +1,5 @@ #****************************************************************************** -# Copyright (c) 2007 IBM Corporation and others. +# Copyright (c) 2007, 2009 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -35,11 +35,9 @@ PROGRAM_NAME=$(PROGRAM_OUTPUT:.exe=) PROGRAM_LIBRARY = eclipse_$(LIB_VERSION).dll # Define the object modules to be compiled and flags. -MAIN_OBJS = eclipseMain.obj aeclipseMain.obj -COMMON_OBJS = eclipseConfig.obj eclipseCommon.obj eclipseWinCommon.obj\ - aeclipseConfig.obj aeclipseCommon.obj aeclipseWinCommon.obj -DLL_OBJS = eclipse.obj eclipseWin.obj eclipseUtil.obj eclipseJNI.obj eclipseShm.obj\ - aeclipse.obj aeclipseWin.obj aeclipseUtil.obj aeclipseJNI.obj aeclipseShm.obj +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 @@ -52,12 +50,11 @@ EXEC = $(PROGRAM_OUTPUT) CONSOLE = $(PROGRAM_NAME)c.exe DLL = $(PROGRAM_LIBRARY) DEBUG = #$(cdebug) -acflags = -I.. -DDEFAULT_OS="\"$(DEFAULT_OS)\"" \ +wcflags = -DUNICODE -I.. -DDEFAULT_OS="\"$(DEFAULT_OS)\"" \ -DDEFAULT_OS_ARCH="\"$(DEFAULT_OS_ARCH)\"" \ -DDEFAULT_WS="\"$(DEFAULT_WS)\"" \ -I$(JAVA_HOME)\include -I$(JAVA_HOME)\include\win32 \ $(cflags) -wcflags = -DUNICODE $(acflags) all: $(EXEC) $(DLL) $(CONSOLE) eclipseMain.obj: ../eclipseUnicode.h ../eclipseCommon.h ../eclipseMain.c @@ -87,33 +84,6 @@ eclipseJNI.obj: ../eclipseCommon.h ../eclipseOS.h ../eclipseJNI.c eclipseShm.obj: ../eclipseShm.h ../eclipseUnicode.h ../eclipseShm.c $(CC) $(DEBUG) $(wcflags) $(cvarsdll) /Fo$*.obj ../eclipseShm.c -aeclipseShm.obj: ../eclipseShm.h ../eclipseUnicode.h ../eclipseShm.c - $(CC) $(DEBUG) $(acflags) $(cvarsdll) /FoaeclipseShm.obj ../eclipseShm.c - -aeclipseJNI.obj: ../eclipseCommon.h ../eclipseOS.h ../eclipseJNI.c - $(cc) $(DEBUG) $(acflags) $(cvarsdll) /FoaeclipseJNI.obj ../eclipseJNI.c - -aeclipseMain.obj: ../eclipseUnicode.h ../eclipseCommon.h ../eclipseMain.c - $(cc) $(DEBUG) $(acflags) $(cvarsdll) /FoaeclipseMain.obj ../eclipseMain.c - -aeclipseCommon.obj: ../eclipseCommon.h ../eclipseUnicode.h ../eclipseCommon.c - $(cc) $(DEBUG) $(acflags) $(cvarsdll) /FoaeclipseCommon.obj ../eclipseCommon.c - -aeclipse.obj: ../eclipseOS.h ../eclipseUnicode.h ../eclipse.c - $(cc) $(DEBUG) $(acflags) $(cvarsdll) /Foaeclipse.obj ../eclipse.c - -aeclipseUtil.obj: ../eclipseUtil.h ../eclipseUnicode.h ../eclipseUtil.c - $(cc) $(DEBUG) $(acflags) $(cvarsdll) /FoaeclipseUtil.obj ../eclipseUtil.c - -aeclipseConfig.obj: ../eclipseConfig.h ../eclipseConfig.h ../eclipseConfig.c - $(cc) $(DEBUG) $(acflags) $(cvarsdll) /FoaeclipseConfig.obj ../eclipseConfig.c - -aeclipseWin.obj: ../eclipseOS.h ../eclipseUnicode.h eclipseWin.c - $(cc) $(DEBUG) $(acflags) $(cvarsdll) /FoaeclipseWin.obj eclipseWin.c - -aeclipseWinCommon.obj: ../eclipseCommon.h eclipseWinCommon.c - $(cc) $(DEBUG) $(acflags) $(cvarsdll) /FoaeclipseWinCommon.obj eclipseWinCommon.c - $(EXEC): $(MAIN_OBJS) $(COMMON_OBJS) $(RES) $(link) $(LFLAGS) -out:$(PROGRAM_OUTPUT) $(MAIN_OBJS) $(COMMON_OBJS) $(RES) $(LIBS) @@ -121,7 +91,6 @@ $(EXEC): $(MAIN_OBJS) $(COMMON_OBJS) $(RES) $(CONSOLE): $(MAIN_OBJS) $(COMMON_OBJS) del -f eclipseConfig.obj aeclipseConfig.obj $(cc) $(DEBUG) $(wcflags) $(cvarsdll) -D_WIN32_CONSOLE /FoeclipseConfig.obj ../eclipseConfig.c - $(cc) $(DEBUG) $(acflags) $(cvarsdll) -D_WIN32_CONSOLE /FoaeclipseConfig.obj ../eclipseConfig.c $(link) $(CONSOLEFLAGS) -out:$(CONSOLE) $(MAIN_OBJS) $(COMMON_OBJS) $(LIBS) $(DLL): $(DLL_OBJS) $(COMMON_OBJS) |