Author: randyk
Date: Mon Sep 3 15:00:52 2007
New Revision: 572433
URL: http://svn.apache.org/viewvc?rev=572433&view=rev
Log:
Add appropriate manifest command to embed manifest files on Win32 when using VC8
Modified:
httpd/apreq/trunk/CHANGES
httpd/apreq/trunk/win32/libapreq2.mak
httpd/apreq/trunk/win32/mod_apreq2.mak
Modified: httpd/apreq/trunk/CHANGES
URL:
http://svn.apache.org/viewvc/httpd/apreq/trunk/CHANGES?rev=572433&r1=572432&r2=572433&view=diff
==============================================================================
--- httpd/apreq/trunk/CHANGES (original)
+++ httpd/apreq/trunk/CHANGES Mon Sep 3 15:00:52 2007
@@ -4,6 +4,10 @@
@section v2_10 Changes with libapreq2-2.10 (under developement)
+- Build [Randy Kobes]
+ Add appropriate manifest command to embed manifest files on Win32
+ when using VC8
+
- C API [Andy Grundman, joes]
Add missing bytes_read initializer to apreq_handle_custom().
Modified: httpd/apreq/trunk/win32/libapreq2.mak
URL:
http://svn.apache.org/viewvc/httpd/apreq/trunk/win32/libapreq2.mak?rev=572433&r1=572432&r2=572433&view=diff
==============================================================================
--- httpd/apreq/trunk/win32/libapreq2.mak (original)
+++ httpd/apreq/trunk/win32/libapreq2.mak Mon Sep 3 15:00:52 2007
@@ -83,12 +83,14 @@
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\libapreq2.bsc"
LINK32=link.exe
+MANIFEST=$(OUTDIR)\libapreq2.dll.manifest
LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib /nologo /dll /incremental:no /machine:I386
/out:"$(OUTDIR)\libapreq2.dll" /implib:"$(OUTDIR)\libapreq2.lib"
"$(OUTDIR)\libapreq2.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
$(LINK32_FLAGS) $(DEF_FLAGS) $(LINK32_OBJS)
<<
+ if exist $(MANIFEST) mt /nologo /manifest $(MANIFEST)
/outputresource:$(OUTDIR)\libapreq2.dll;2
!ELSEIF "$(CFG)" == "libapreq2 - Win32 Debug"
@@ -102,12 +104,14 @@
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\libapreq2.bsc"
LINK32=link.exe
+MANIFEST=$(OUTDIR)\libapreq2.dll.manifest
LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\libapreq2.pdb"
/debug /machine:I386 /out:"$(OUTDIR)\libapreq2.dll"
/implib:"$(OUTDIR)\libapreq2.lib" /pdbtype:sept
"$(OUTDIR)\libapreq2.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
$(LINK32_FLAGS) $(DEF_FLAGS) $(LINK32_OBJS)
<<
+ if exist $(MANIFEST) mt /nologo /manifest $(MANIFEST)
/outputresource:$(OUTDIR)\libapreq2.dll;2
!ENDIF
Modified: httpd/apreq/trunk/win32/mod_apreq2.mak
URL:
http://svn.apache.org/viewvc/httpd/apreq/trunk/win32/mod_apreq2.mak?rev=572433&r1=572432&r2=572433&view=diff
==============================================================================
--- httpd/apreq/trunk/win32/mod_apreq2.mak (original)
+++ httpd/apreq/trunk/win32/mod_apreq2.mak Mon Sep 3 15:00:52 2007
@@ -77,11 +77,13 @@
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_apreq2.bsc"
LINK32=link.exe
+MANIFEST=$(OUTDIR)\mod_apreq2.so.manifest
LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib /nologo /dll /incremental:no /machine:I386
/out:"$(OUTDIR)\mod_apreq2.so" /implib:"$(OUTDIR)\mod_apreq2.lib"
"$(OUTDIR)\mod_apreq2.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
+ if exist $(MANIFEST) mt /nologo /manifest $(MANIFEST)
/outputresource:$(OUTDIR)\mod_apreq2.so;2
!ELSEIF "$(CFG)" == "mod_apreq2 - Win32 Debug"
@@ -95,11 +97,13 @@
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_apreq2.bsc"
LINK32=link.exe
+MANIFEST=$(OUTDIR)\mod_apreq2.so.manifest
LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\mod_apreq2.pdb"
/debug /machine:I386 /out:"$(OUTDIR)\mod_apreq2.so"
/implib:"$(OUTDIR)\mod_apreq2.lib" /pdbtype:sept
"$(OUTDIR)\mod_apreq2.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
+ if exist $(MANIFEST) mt /nologo /manifest $(MANIFEST)
/outputresource:$(OUTDIR)\mod_apreq2.so;2
!ENDIF
