- Make the package compile for i386

- Make the pAddr arg for DivertRecv() optional
- Make the i386 user binaries compatible with an amd64 driver.
  (useful for projects not yet ported to amd64)

sys/sources

@@ -14,6 +14,12 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+!IF "$(_BUILDARCH)" == "x86"
+CPU=i386
+!ELSE
+CPU=$(_BUILDARCH)
+!ENDIF
+
 TARGETNAME=divert
 TARGETTYPE=DRIVER
 TARGETPATH=..\install
@@ -23,8 +29,8 @@ TARGETLIBS=\
     $(DDK_LIB_PATH)\fwpkclnt.lib \
     $(SDK_LIB_PATH)\uuid.lib
 NTTARGETFILES=\
-    $(TARGETPATH)\$(_BUILDARCH)\divert.inf \
-    $(TARGETPATH)\$(_BUILDARCH)\WdfCoInstaller01009.dll
+    $(TARGETPATH)\$(CPU)\divert.inf \
+    $(TARGETPATH)\$(CPU)\WdfCoInstaller01009.dll
 KMDF_VERSION_MAJOR=1
 C_DEFINES=$(C_DEFINES) -DBINARY_COMPATIBLE=0 -DNT -DUNICODE -D_UNICODE \
     -DNDIS60 -DNDIS_SUPPORT_NDIS60