Francois Gouget : testbot/src: Standardize the makefiles.
Alexandre Julliard
julliard at winehq.org
Fri Aug 31 12:51:18 CDT 2012
Module: tools
Branch: master
Commit: f815b0545e26b5d4d0aa35a3edac7eaea029b180
URL: http://source.winehq.org/git/tools.git/?a=commit;h=f815b0545e26b5d4d0aa35a3edac7eaea029b180
Author: Francois Gouget <fgouget at codeweavers.com>
Date: Fri Aug 31 17:19:36 2012 +0200
testbot/src: Standardize the makefiles.
Use the standard MinGW compiler names.
Also strip the TestLauncher binaries.
---
testbot/src/GenFixEnv/Makefile | 15 ++++++++-------
testbot/src/TestLauncher/Makefile | 21 +++++++++++++--------
2 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/testbot/src/GenFixEnv/Makefile b/testbot/src/GenFixEnv/Makefile
index e51d650..c80a5c3 100644
--- a/testbot/src/GenFixEnv/Makefile
+++ b/testbot/src/GenFixEnv/Makefile
@@ -1,9 +1,10 @@
-CROSSCC32=i686-pc-mingw32-gcc
-CROSSSTRIP=i686-pc-mingw32-strip
-BINDIR=../../bin
+bindir = ../../bin
-all: ${BINDIR}/GenFixEnv.exe
+CROSSCC32 = i686-w64-mingw32-gcc
+CROSSSTRIP32 = i686-w64-mingw32-strip
-${BINDIR}/GenFixEnv.exe: GenFixEnv.c
- ${CROSSCC32} -o ${BINDIR}/GenFixEnv.exe -O2 -D_WIN32_IE=0x0500 GenFixEnv.c
- ${CROSSSTRIP} ${BINDIR}/GenFixEnv.exe
+all: $(bindir)/GenFixEnv.exe
+
+$(bindir)/GenFixEnv.exe: GenFixEnv.c
+ $(CROSSCC32) -o $@ $<
+ $(CROSSSTRIP32) $@
diff --git a/testbot/src/TestLauncher/Makefile b/testbot/src/TestLauncher/Makefile
index 5260e50..822aef7 100644
--- a/testbot/src/TestLauncher/Makefile
+++ b/testbot/src/TestLauncher/Makefile
@@ -1,11 +1,16 @@
-CROSSCC32=i686-pc-mingw32-gcc
-CROSSCC64=x86_64-w64-mingw32-gcc
-BINDIR=../../bin
+bindir = ../../bin
-all: ${BINDIR}/TestLauncher32.exe ${BINDIR}/TestLauncher64.exe
+CROSSCC32 = i686-w64-mingw32-gcc
+CROSSSTRIP32 = i686-w64-mingw32-strip
+CROSSCC64 = x86_64-w64-mingw32-gcc
+CROSSSTRIP64 = x86_64-w64-mingw32-strip
-${BINDIR}/TestLauncher32.exe: TestLauncher.c
- ${CROSSCC32} -o ${BINDIR}/TestLauncher32.exe TestLauncher.c
+all: $(bindir)/TestLauncher32.exe $(bindir)/TestLauncher64.exe
-${BINDIR}/TestLauncher64.exe: TestLauncher.c
- ${CROSSCC64} -o ${BINDIR}/TestLauncher64.exe TestLauncher.c
+$(bindir)/TestLauncher32.exe: TestLauncher.c
+ $(CROSSCC32) -o $@ $<
+ $(CROSSSTRIP32) $@
+
+$(bindir)/TestLauncher64.exe: TestLauncher.c
+ $(CROSSCC64) -o $@ $<
+ $(CROSSSTRIP64) $@
More information about the wine-cvs
mailing list