From a313c85544e103d2cf235a971fa0fb77d2eb05da Mon Sep 17 00:00:00 2001 From: "mkaply%us.ibm.com" Date: Fri, 9 Mar 2001 04:05:44 +0000 Subject: [PATCH] #59855 r=pchwartau, sr=brendan Rework makefile.win and js.mak for the eventual ability to include jstypes.h in fdlibm.h Not turned on yet because I can't get it working right on Linux --- js/src/js.mak | 4 ++-- js/src/makefile.win | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/js/src/js.mak b/js/src/js.mak index f28e62a261f4..4c35126b01a2 100644 --- a/js/src/js.mak +++ b/js/src/js.mak @@ -537,7 +537,7 @@ CPP=cl.exe # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c # ADD CPP /nologo /MD /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_IEEE_LIBM" /YX /c CPP_PROJ=/nologo /MD /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D\ - "_IEEE_LIBM" /Fp"$(INTDIR)/fdlibm.pch" /YX /Fo"$(INTDIR)/" /c + "_IEEE_LIBM" /D "XP_PC" /I .\ /Fp"$(INTDIR)/fdlibm.pch" /YX /Fo"$(INTDIR)/" /c CPP_OBJS=.\Release/ CPP_SBRS=.\. @@ -633,7 +633,7 @@ CPP=cl.exe # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c # ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_IEEE_LIBM" /YX /c CPP_PROJ=/nologo /MDd /W3 /GX /Z7 /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D\ - "_IEEE_LIBM" /Fp"$(INTDIR)/fdlibm.pch" /YX /Fo"$(INTDIR)/" /c + "_IEEE_LIBM" /D "XP_PC" -I .\ /Fp"$(INTDIR)/fdlibm.pch" /YX /Fo"$(INTDIR)/" /c CPP_OBJS=.\Debug/ CPP_SBRS=.\. diff --git a/js/src/makefile.win b/js/src/makefile.win index 0244059a4762..1d1be1910a2d 100644 --- a/js/src/makefile.win +++ b/js/src/makefile.win @@ -44,7 +44,7 @@ DIRS = liveconnect !endif !endif -DIRS = $(DIRS) fdlibm xpconnect +DIRS = $(DIRS) xpconnect #//------------------------------------------------------------------------ #// @@ -193,7 +193,7 @@ $(FDLIBM_LIBRARY): @cd $(MAKEDIR) !endif -export:: $(DLL) INSTALL_FILES +export:: INSTALL_FILES $(DLL) $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib