repository: C:/dev/kvm-guest-drivers-windows
branch: master
commit 5a045921f6d2c1062eeffecb9134aba169950de5
Author: Yan Vugenfirer <[email protected]>
Date: Thu Feb 11 17:09:00 2010 +0200
[WIN-GUEST-DRIVERS] viostore - add ability to compile specifically for
Windows 7
Signed-off-by: Yan Vugenfirer <[email protected]>
diff --git a/viostor/SOURCES b/viostor/SOURCES
index a98a081..edc46ef 100644
--- a/viostor/SOURCES
+++ b/viostor/SOURCES
@@ -1,15 +1,17 @@
TARGETNAME=viostor
TARGETTYPE=MINIPORT
-!if "$(DDK_TARGET_OS)" == "WinNET"
+!if "$(DDK_TARGET_OS)" == "WinNET"
C_DEFINES = -DUSE_STORPORT=1 $(C_DEFINES)
TARGETLIBS=$(SDK_LIB_PATH)\storport.lib
!elseif "$(DDK_TARGET_OS)" == "WinLH"
C_DEFINES = -DUSE_STORPORT=1 $(C_DEFINES)
-C_DEFINES = -DMSI_SUPPORTED=1 $(C_DEFINES)
TARGETLIBS=$(SDK_LIB_PATH)\storport.lib
-!else
+!elseif "$(DDK_TARGET_OS)" == "WinXP"
TARGETLIBS=$(SDK_LIB_PATH)\scsiport.lib
+!else
+C_DEFINES = -DUSE_STORPORT=1 $(C_DEFINES)
+TARGETLIBS=$(SDK_LIB_PATH)\storport.lib
!endif
SOURCES= virtio_stor.c \
@@ -34,6 +36,6 @@ MSC_WARNING_LEVEL=/W3 /WX
# UNSUPPORTED OPTION
#
# Define this if you want debug messages to come out the console
-#
+#
C_DEFINES = -DRHEL_COM_DEBUG=1 $(C_DEFINES)
diff --git a/viostor/buildAll.bat b/viostor/buildAll.bat
index 8d05802..668efe7 100644
--- a/viostor/buildAll.bat
+++ b/viostor/buildAll.bat
@@ -1,19 +1,23 @@
:
: Set global parameters:
:
+
+: Use Windows 7 DDK
if "%DDKVER%"=="" set DDKVER=7600.16385.0
-set BUILDROOT=C:\WINDDK\%DDKVER%
+
+: By default DDK is installed under C:\WINDDK, but it can be installed in
different location
+if "%DDKISNTALLROOT%"=="" set DDKISNTALLROOT=C:\WINDDK\
+set BUILDROOT=%DDKISNTALLROOT%%DDKVER%
set X64ENV=x64
if "%DDKVER%"=="6000" set X64ENV=amd64
if not "%1"=="" goto parameters_here
echo no parameters specified, rebuild all
call clean.bat
-call "%0" Vista Vista64 Win2003 Win200364 XP
+call "%0" WIN7 WIN7_64 Vista Vista64 Win2003 Win200364 XP
goto :eof
:parameters_here
-
:nextparam
if "%1"=="" goto :eof
goto %1
@@ -21,15 +25,24 @@ goto %1
shift
goto nextparam
+:Win7
+set DDKBUILDENV=
+pushd %BUILDROOT%
+call %BUILDROOT%\bin\setenv.bat %BUILDROOT% fre WIN7
+popd
+build -cZg
+
+goto continue
+
+:Win7_64
+set DDKBUILDENV=
+pushd %BUILDROOT%
+call %BUILDROOT%\bin\setenv.bat %BUILDROOT% %X64ENV% fre WIN7
+popd
+build -cZg
+
+goto continue
-:preparebuild
-echo DIRS=%* > dirs
-for %%f in (%*) do echo !include $(NTMAKEENV)\makefile.def > %%f\makefile
-set /a _NT_TARGET_MAJ="%_NT_TARGET_VERSION% >> 8"
-set /a _NT_TARGET_MIN="%_NT_TARGET_VERSION% & 255"
-set
_VERSION_=%_NT_TARGET_MAJ%.%_NT_TARGET_MIN%.%_MAJORVERSION_%.%_MINORVERSION_%
-echo version set: %_VERSION_%
-goto :eof
:Vista
set DDKBUILDENV=
@@ -74,7 +87,4 @@ call %BUILDROOT%\bin\setenv.bat %BUILDROOT% fre WXP
popd
build -cZg
-
-
-
goto :eof
diff --git a/viostor/clean.bat b/viostor/clean.bat
index 25b72c7..e47a389 100644
--- a/viostor/clean.bat
+++ b/viostor/clean.bat
@@ -6,7 +6,8 @@ rmdir /S /Q objfre_wnet_amd64
rmdir /S /Q objfre_w2k_x86
rmdir /S /Q objfre_wlh_x86
rmdir /S /Q objfre_wlh_amd64
-
+rmdir /S /Q objfre_win7_x86
+rmdir /S /Q objfre_win7_amd64
diff --git a/viostor/virtio_stor.aps b/viostor/virtio_stor.aps
new file mode 100644
index 0000000..def9d87
Binary files /dev/null and b/viostor/virtio_stor.aps differ
--
To unsubscribe from this list: send the line "unsubscribe kvm-commits" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
