From be395b0cfc9a489b49dfb407edfb20bdd05a08d9 Mon Sep 17 00:00:00 2001 From: zimmerma Date: Mon, 14 Sep 2009 08:13:27 +0000 Subject: =?UTF-8?q?[Makefile.vc]=20update=20from=20Mickael=20Gastineau:=20?= =?UTF-8?q?Suite=20=C3=A0=20une=20requete=20de=20Chris=20Saunders=20(en=20?= =?UTF-8?q?dehors=20de=20la=20liste=20mpc-discuss),=20J'ai=20mis=20=C3=A0?= =?UTF-8?q?=20jour=20le=20makefile=20pour=20windows=20pour=20qu'il=20puiss?= =?UTF-8?q?e=20cr=C3=A9er=20soit=20une=20version=20statique=20ou=20dynamiq?= =?UTF-8?q?ue=20de=20mpc.=20=20Vous=20trouverez=20ci-joint=20ce=20nouveau?= =?UTF-8?q?=20makefile.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://scm.gforge.inria.fr/svn/mpc/trunk@674 211d60ee-9f03-0410-a15a-8952a2c7a4e4 --- Makefile.vc | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) (limited to 'Makefile.vc') diff --git a/Makefile.vc b/Makefile.vc index d9fe555..3b39f01 100644 --- a/Makefile.vc +++ b/Makefile.vc @@ -24,15 +24,22 @@ # nmake /f Makefile.vc clean # clean the temporaries objects # -# nmake /f Makefile.vc GMPDIR=gmpdirectory MPFRDIR=mpfrdirectory +# nmake /f Makefile.vc STATIC=0|1 GMPDIR=gmpdirectory MPFRDIR=mpfrdirectory # compile MPC # -# nmake /f Makefile.vc install GMPDIR=gmpdirectory MPFRDIR=mpfrdirectory DESTDIR=installdirectory +# nmake /f Makefile.vc STATIC=0|1 install GMPDIR=gmpdirectory MPFRDIR=mpfrdirectory DESTDIR=installdirectory # install MPC to installdirectory # -# nmake /f Makefile.vc check GMPDIR=gmpdirectory MPFRDIR=mpfrdirectory +# nmake /f Makefile.vc STATIC=0|1 check GMPDIR=gmpdirectory MPFRDIR=mpfrdirectory # perform tests on MPC # +# GMPDIR : specify the location where GMP is installed +# MPFRDIR : specify the location where MPFR is installed +# DESTDIR : specify the location where MPC will be installed +# STATIC : specify if a static or dynamic library of MPC will be created +# STATIC=1 : build a static library +# STATIC=0 : build a dynamic library (DLL) +# A dynamic library is created by default if STATIC is omitted (STATIC=0) CPP = cl.exe @@ -46,8 +53,18 @@ VERSION=0.7.1-dev DIRMPC=.\src DIRMPCTESTS=.\tests\\ +!if "$(STATIC)" == "0" +LIBRARY = libmpc.dll +LINKER = link.exe /DLL +GMPMUSTBEDLL=/D__GMP_LIBGMP_DLL +!else +LIBRARY = libmpc.lib +LINKER = lib.exe +GMPMUSTBEDLL= +!endif + INCLUDES = /I$(DIRMPC) /I$(GMPDIR)\include /I$(MPFR)\include -CKERNELFLAGS = $(CDEFAULTFLAGS) /D__GMP_LIBGMP_DLL $(INCLUDES) +CKERNELFLAGS = $(CDEFAULTFLAGS) $(GMPMUSTBEDLL) $(INCLUDES) CFLAGS = $(CKERNELFLAGS) /D__MPC_WITHIN_MPC /D_GMP_IEEE_FLOATS /DHAVE_CONFIG_H TESTCOMPILE=$(CC) $(CKERNELFLAGS) $(DIRMPCTESTS)\tgeneric.c $(DIRMPCTESTS)\comparisons.c $(DIRMPCTESTS)\read_data.c $(DIRMPCTESTS)\random.c $(DIRMPCTESTS) @@ -62,7 +79,6 @@ ENDTESTCOMPILE=/LIBPATH:"$(GMPDIR)\lib" libmpc.lib libmpfr.lib libgmp.lib #generate the list for tests : goto tests and execute # ls t*.c | sed "s/\.c//" | awk ' { printf("\t$(TESTCOMPILE)%s.c $(MIDTESTCOMPILE)%s.exe $(ENDTESTCOMPILE)\n\tcd $(DIRMPCTESTS) && %s.exe && cd ..\n",$1,$1,$1,$1); } ' -LIBRARY = libmpc.dll LIBRARYLIB = libmpc.lib CPPOBJECTS = $(DIRMPC)\abs.obj \ @@ -193,7 +209,7 @@ urandom.obj # $(LIBRARY): $(DIRMPC)config.h $(CPPOBJECTS) - link.exe /DLL /out:$@ $(CPPLINKOBJECTS) /LIBPATH:"$(GMPDIR)\lib" libmpfr.lib libgmp.lib + $(LINKER) /out:$@ $(CPPLINKOBJECTS) /LIBPATH:"$(GMPDIR)\lib" libmpfr.lib libgmp.lib $(DIRMPC)config.h : echo #define PACKAGE_STRING "mpc" >$(DIRMPC)\config.h @@ -228,8 +244,8 @@ install: $(LIBRARY) # check : test test : - copy $(GMPDIR)\lib\*gmp*.dll $(DIRMPCTESTS) - copy $(MPFRDIR)\lib\*mpfr*.dll $(DIRMPCTESTS) + -copy $(GMPDIR)\lib\*gmp*.dll $(DIRMPCTESTS) + -copy $(MPFRDIR)\lib\*mpfr*.dll $(DIRMPCTESTS) copy $(LIBRARY) $(DIRMPCTESTS) $(TESTCOMPILE)tabs.c $(MIDTESTCOMPILE)tabs.exe $(ENDTESTCOMPILE) cd $(DIRMPCTESTS) && tabs.exe && cd .. @@ -325,3 +341,4 @@ test : @echo All tests passed @echo -------------------------------------------------- + -- cgit v1.2.1