You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by wr...@apache.org on 2007/10/19 11:43:45 UTC
svn commit: r586350 - in /apr/apr-iconv/trunk: build/modules.mk.win
ccs/Makefile.win ces/Makefile.win
Author: wrowe
Date: Fri Oct 19 02:43:45 2007
New Revision: 586350
URL: http://svn.apache.org/viewvc?rev=586350&view=rev
Log:
Having gone 12 rounds with VC8, it finally agrees with me.
That is, provided we share one pdb used which corresponds
to the precompiled pch, and in the process I determined
a much cleaner solution to generating the pch without
goofy shell if exist's ( ).
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=586350&r1=586349&r2=586350&view=diff
==============================================================================
--- apr/apr-iconv/trunk/build/modules.mk.win (original)
+++ apr/apr-iconv/trunk/build/modules.mk.win Fri Oct 19 02:43:45 2007
@@ -193,8 +193,7 @@
API_SOURCE = ..
OUTPUT_DIR = $(API_SOURCE)\$(CFG_OUTPUT)
-INT_CFLAGS = /nologo $(CFG_CFLAGS) /Fd"$(OUTPUT_DIR)\iconv_src" \
- /Fp"$(PCH)" \
+INT_CFLAGS = /nologo $(CFG_CFLAGS) /Fd$(MODRES).pdb /Fp$(MODRES).pch \
/I "$(API_SOURCE)\include" /I "$(API_SOURCE)\lib" \
/I "$(APR_SOURCE)\include" \
/D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL"
@@ -207,23 +206,23 @@
LDFLAGS =
ALL_LDFLAGS = $(INT_LDFLAGS) $(LDFLAGS)
-all: $(OUTPUT_DIR) $(ALL_TARGETS)
+all: $(OUTPUT_DIR) $(MODRES).pch $(ALL_TARGETS)
$(OUTPUT_DIR):
- -$(SILENT)if not exist "$(OUTPUT_DIR)\$(NULL)" mkdir "$(OUTPUT_DIR)"
+ $(SILENT)if not exist "$(OUTPUT_DIR)\$(NULL)" mkdir "$(OUTPUT_DIR)"
+
+$(MODRES).pch:
+ echo #define ICONV_INTERNAL > $*.c
+ echo #include "iconv.h" >> $*.c
+ $(SILENT)cl $(ALL_CFLAGS) /Fo$*.obj /Yciconv.h /c $*.c
.c{$(OUTPUT_DIR)}.so:
- $(SILENT)if not exist "$(OUTPUT_DIR)\iconv.pch" ( \
- echo Precompiling iconv.pch from iconv.h & \
- cl $(ALL_CFLAGS) /Yc"iconv.h" /Fo"$*.obj" /c $< \
- ) else ( \
- cl $(ALL_CFLAGS) /Yu"iconv.h" /Fo"$*.obj" /c $< \
- )
+ $(SILENT)cl $(ALL_CFLAGS) /Fo$*.obj /Yuiconv.h /c $<
$(SILENT)link $(ALL_LDFLAGS) $*.obj $(API_LIBS) /out:$@ \
- /base:@"..\build\BaseAddr.ref",$(@F) & \
- ( if exist $@.manifest \
- mt -manifest $@.manifest -outputresource:$@;2 ) & \
- del "$*.exp" & del "$*.lib"
+ /base:@"..\build\BaseAddr.ref",$(@F)
+ $(SILENT)if exist $@.manifest \
+ $(SILENT)mt -nologo -manifest $@.manifest -outputresource:$@;2
+ $(SILENT)del "$*.exp" & del "$*.lib"
# The rebase target below is used only to *regenerate* the BaseAddr.ref file
# if the module list or sizes change considerably. Use the rebase target to
Modified: apr/apr-iconv/trunk/ccs/Makefile.win
URL: http://svn.apache.org/viewvc/apr/apr-iconv/trunk/ccs/Makefile.win?rev=586350&r1=586349&r2=586350&view=diff
==============================================================================
--- apr/apr-iconv/trunk/ccs/Makefile.win (original)
+++ apr/apr-iconv/trunk/ccs/Makefile.win Fri Oct 19 02:43:45 2007
@@ -197,6 +197,6 @@
$(OUTPUT_DIR)\windows-1258.so
REBASE_TOP = 0x6ED50000
-PCH=$(OUTPUT_DIR)\ccsiconv.pch
+MODRES=$(OUTPUT_DIR)\ccsiconv
!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=586350&r1=586349&r2=586350&view=diff
==============================================================================
--- apr/apr-iconv/trunk/ces/Makefile.win (original)
+++ apr/apr-iconv/trunk/ces/Makefile.win Fri Oct 19 02:43:45 2007
@@ -17,6 +17,6 @@
$(OUTPUT_DIR)\utf-8.so
REBASE_TOP = 0x6EE50000
-PCH=$(OUTPUT_DIR)\cesiconv.pch
+MODRES=$(OUTPUT_DIR)\cesiconv
!INCLUDE ../build/modules.mk.win