Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Niefer2009-10-06 14:42:49 -0400
committerAndrew Niefer2009-10-06 14:42:49 -0400
commit9ffafc45f7a2bf838733d2317d50c6455ef8b5dc (patch)
tree4e264ac1fdbbe735c82e95e1427d01e28b375f57 /bundles/org.eclipse.equinox.executable/library/win32/make_mingw.mak
parent5611a9970e1942135a413f6244473f8ea5094fbe (diff)
downloadrt.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_mingw.mak')
-rw-r--r--bundles/org.eclipse.equinox.executable/library/win32/make_mingw.mak41
1 files changed, 5 insertions, 36 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 6bc262c26..449b33f67 100644
--- a/bundles/org.eclipse.equinox.executable/library/win32/make_mingw.mak
+++ b/bundles/org.eclipse.equinox.executable/library/win32/make_mingw.mak
@@ -1,5 +1,5 @@
#*******************************************************************************
-# Copyright (c) 2000, 2005 IBM Corporation and others.
+# Copyright (c) 2000, 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
@@ -52,11 +52,9 @@ $(error Unable to find $(CCVER)-pc-cygwin-gcc)
endif
# Define the object modules to be compiled and flags.
-MAIN_OBJS = eclipseMain.o aeclipseMain.o
-COMMON_OBJS = eclipseConfig.o eclipseCommon.o eclipseWinCommon.o\
- aeclipseConfig.o aeclipseCommon.o aeclipseWinCommon.o
-DLL_OBJS = eclipse.o eclipseWin.o eclipseUtil.o eclipseJNI.o eclipseShm.o\
- aeclipse.o aeclipseWin.o aeclipseUtil.o aeclipseJNI.o aeclipseShm.o
+MAIN_OBJS = eclipseMain.o
+COMMON_OBJS = eclipseConfig.o eclipseCommon.o eclipseWinCommon.o
+DLL_OBJS = eclipse.o eclipseWin.o eclipseUtil.o eclipseJNI.o eclipseShm.o
LIBS = -lkernel32 -luser32 -lgdi32 -lcomctl32 -lmsvcrt -lversion
LDFLAGS = -mwindows -mno-cygwin
@@ -72,32 +70,22 @@ CFLAGS = -g -s -Wall \
-D_WIN32 \
-DWIN32_LEAN_AND_MEAN \
-mno-cygwin -D__int64="long long"
-ACFLAGS = -I.. -DDEFAULT_OS="\"$(DEFAULT_OS)\"" \
+WCFLAGS = -DUNICODE -I.. -DDEFAULT_OS="\"$(DEFAULT_OS)\"" \
-DDEFAULT_OS_ARCH="\"$(DEFAULT_OS_ARCH)\"" \
-DDEFAULT_WS="\"$(DEFAULT_WS)\"" \
$(DEBUG) $(CFLAGS)
-WCFLAGS = -DUNICODE $(ACFLAGS)
all: $(EXEC) $(DLL) $(CONSOLE)
eclipseMain.o: ../eclipseUnicode.h ../eclipseCommon.h ../eclipseMain.c
$(CC) $(DEBUG) $(WCFLAGS) -c -o $@ ../eclipseMain.c
-aeclipseMain.o: ../eclipseUnicode.h ../eclipseCommon.h ../eclipseMain.c
- $(CC) $(DEBUG) $(ACFLAGS) -c -o $@ ../eclipseMain.c
-
eclipseCommon.o: ../eclipseCommon.h ../eclipseUnicode.h ../eclipseCommon.c
$(CC) $(DEBUG) $(WCFLAGS) -c -o $@ ../eclipseCommon.c
-aeclipseCommon.o: ../eclipseCommon.h ../eclipseUnicode.h ../eclipseCommon.c
- $(CC) $(DEBUG) $(ACFLAGS) -c -o $@ ../eclipseCommon.c
-
eclipseWinCommon.o: ../eclipseCommon.h eclipseWinCommon.c
$(CC) $(DEBUG) $(WCFLAGS) -c -o $@ eclipseWinCommon.c
-aeclipseWinCommon.o: ../eclipseCommon.h eclipseWinCommon.c
- $(CC) $(DEBUG) $(ACFLAGS) -c -o $@ eclipseWinCommon.c
-
eclipse.o: ../eclipseOS.h ../eclipseUnicode.h ../eclipseJNI.h ../eclipseCommon.h ../eclipse.c
$(CC) $(DEBUG) $(WCFLAGS) -c -o $@ ../eclipse.c
@@ -116,24 +104,6 @@ eclipseJNI.o: ../eclipseUnicode.h ../eclipseJNI.c
eclipseShm.o: ../eclipseShm.h ../eclipseUnicode.h ../eclipseShm.c
$(CC) $(DEBUG) $(WCFLAGS) -c -o $@ ../eclipseShm.c
-aeclipseShm.o: ../eclipseShm.h ../eclipseUnicode.h ../eclipseShm.c
- $(CC) $(DEBUG) $(ACFLAGS) -c -o $@ ../eclipseShm.c
-
-aeclipse.o: ../eclipseOS.h ../eclipseUnicode.h ../eclipseCommon.h ../eclipse.c
- $(CC) $(DEBUG) $(ACFLAGS) -c -o $@ ../eclipse.c
-
-aeclipseUtil.o: ../eclipseUtil.h ../eclipseUnicode.h ../eclipseUtil.c
- $(CC) $(DEBUG) $(ACFLAGS) -c -o $@ ../eclipseUtil.c
-
-aeclipseConfig.o: ../eclipseConfig.h ../eclipseUnicode.h ../eclipseConfig.c
- $(CC) $(DEBUG) $(ACFLAGS) -c -o $@ ../eclipseConfig.c
-
-aeclipseWin.o: ../eclipseOS.h ../eclipseUnicode.h eclipseWin.c
- $(CC) $(DEBUG) $(ACFLAGS) -c -o $@ eclipseWin.c
-
-aeclipseJNI.o: ../eclipseUnicode.h ../eclipseJNI.c
- $(CC) $(DEBUG) $(ACFLAGS) -c -o $@ ../eclipseJNI.c
-
$(RES): $(PROGRAM_NAME).rc
$(RC) --output-format=coff --include-dir=.. -o $@ $<
@@ -144,7 +114,6 @@ $(EXEC): $(MAIN_OBJS) $(COMMON_OBJS) $(RES)
$(CONSOLE): $(MAIN_OBJS) $(COMMON_OBJS)
rm -f eclipseConfig.o aeclipseConfig.o
$(CC) $(DEBUG) $(WCFLAGS) -D_WIN32_CONSOLE -c -o eclipseConfig.o ../eclipseConfig.c
- $(CC) $(DEBUG) $(ACFLAGS) -D_WIN32_CONSOLE -c -o aeclipseConfig.o ../eclipseConfig.c
$(CC) $(CONSOLEFLAGS) -o $(CONSOLE) $(MAIN_OBJS) $(COMMON_OBJS) $(LIBS)
$(DLL): $(DLL_OBJS) $(COMMON_OBJS)

Back to the top