apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r586314 - in /apr/apr-iconv/trunk: build/modules.mk.win ccs/Makefile.win ces/Makefile.win
Date Fri, 19 Oct 2007 08:16:39 GMT
Author: wrowe
Date: Fri Oct 19 01:16:38 2007
New Revision: 586314

URL: http://svn.apache.org/viewvc?rev=586314&view=rev
Log:
A different way to solve the headers issue; one precompiled
header per Makefile.win

Modified:
    apr/apr-iconv/trunk/build/modules.mk.win
    apr/apr-iconv/trunk/ccs/Makefile.win
    apr/apr-iconv/trunk/ces/Makefile.win

Modified: apr/apr-iconv/trunk/build/modules.mk.win
URL: http://svn.apache.org/viewvc/apr/apr-iconv/trunk/build/modules.mk.win?rev=586314&r1=586313&r2=586314&view=diff
==============================================================================
--- apr/apr-iconv/trunk/build/modules.mk.win (original)
+++ apr/apr-iconv/trunk/build/modules.mk.win Fri Oct 19 01:16:38 2007
@@ -194,7 +194,7 @@
 OUTPUT_DIR   = $(API_SOURCE)\$(CFG_OUTPUT)
 
 INT_CFLAGS   = /nologo $(CFG_CFLAGS) /Fd"$(OUTPUT_DIR)\iconv_src" \
-		/Fp"$(OUTPUT_DIR)\iconv.pch" /Yu"iconv.h" \
+		/Fp"$(PCH)" \
 		/I "$(API_SOURCE)\include" /I "$(API_SOURCE)\lib" \
 		/I "$(APR_SOURCE)\include" \
 		/D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL"
@@ -217,7 +217,7 @@
 	  echo Precompiling iconv.pch from iconv.h & \
 	  cl $(ALL_CFLAGS) /Yc"iconv.h" /Fo"$*.obj" /c $< \
 	) else ( \
-	  cl $(ALL_CFLAGS) /Fo"$*.obj" /c $< \
+	  cl $(ALL_CFLAGS) /Yu"iconv.h" /Fo"$*.obj" /c $< \
 	)
 	$(SILENT)link $(ALL_LDFLAGS) $*.obj $(API_LIBS) /out:$@ \
 		/base:@"..\build\BaseAddr.ref",$(@F) & \

Modified: apr/apr-iconv/trunk/ccs/Makefile.win
URL: http://svn.apache.org/viewvc/apr/apr-iconv/trunk/ccs/Makefile.win?rev=586314&r1=586313&r2=586314&view=diff
==============================================================================
--- apr/apr-iconv/trunk/ccs/Makefile.win (original)
+++ apr/apr-iconv/trunk/ccs/Makefile.win Fri Oct 19 01:16:38 2007
@@ -197,5 +197,6 @@
 	$(OUTPUT_DIR)\windows-1258.so
 
 REBASE_TOP = 0x6ED50000
+PCH=$(OUTPUT_DIR)\ccsiconv.pch
 
 !INCLUDE ../build/modules.mk.win

Modified: apr/apr-iconv/trunk/ces/Makefile.win
URL: http://svn.apache.org/viewvc/apr/apr-iconv/trunk/ces/Makefile.win?rev=586314&r1=586313&r2=586314&view=diff
==============================================================================
--- apr/apr-iconv/trunk/ces/Makefile.win (original)
+++ apr/apr-iconv/trunk/ces/Makefile.win Fri Oct 19 01:16:38 2007
@@ -17,5 +17,6 @@
 	$(OUTPUT_DIR)\utf-8.so
 
 REBASE_TOP = 0x6EE50000
+PCH=$(OUTPUT_DIR)\cesiconv.pch
 
 !INCLUDE ../build/modules.mk.win



Mime
View raw message