Created SNFMultiSDK_Windows_3.1.zip after Pete updated SNFMulti.cpp.

git-svn-id: https://svn.microneil.com/svn/PKG-SNF-SDK-WIN/trunk@18 7d91e7c8-5a61-404e-b06a-95855fde9112

CodeBlocks/SNFMultiTest/SNFMultiTest.layout

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <CodeBlocks_layout_file>
 	<ActiveTarget name="Debug" />
-	<File name="..\..\SNFMultiTest\main.cpp" open="1" top="1" tabpos="1">
+	<File name="..\..\SNFMultiTest\main.cpp" open="1" top="1" tabpos="0">
 		<Cursor position="7577" topLine="128" />
 	</File>
 </CodeBlocks_layout_file>

MinGW-32/README

@@ -12,6 +12,7 @@ To build SNFMulti.dll
   directory.  The source files are in the ../SNFMulti and
   ../CodeDweller directories.
 
+
   2) Run "buildSNFMultiDLL.cmd".  This builds snfmulti.dll,
   libsnfmulti.a, and snfmulti.def.  These are the same files built
   by Code::Blocks.
@@ -25,7 +26,7 @@ To build the import and export SNFMulti libraries for VS2008:
 To copy to where the sample programs can find the files:
 
   1) Run "installSNFMultiLibrary.cmd".  This copies the output files into
-  the ..\64bitDll directory.
+  the ..\32bitDll directory.
 
 To build SNFMultiTest linked with SNFMulti.dll:
 
@@ -34,3 +35,12 @@ To build SNFMultiTest linked with SNFMulti.dll:
    directory, SNFMultiTest.exe can be run from the command line
    without modifying the PATH variable.
 
+To run SNFMultiTest:
+
+  1) Make sure that all DLLs required by MinGW are available to
+     SNFMultiTest.  For example, MinGW 5.1.4 needs mingwm10.dll, which
+     is in \MinGW\bin.
+
+  2) Make sure that the sniffer configuration file is named
+     prescale.xml, and is in the current directory.  A suitable
+     configuration file is ..\SNFMultiSDK_Windows_3.1\snf_engine.xml.

MinGW-64/README

@@ -1,10 +1,24 @@
 README file for command files for building SNFServer library and applications
 
-Copyright (c) 2009 ARM Research Laboratories
+Copyright (c) 2009-2012 ARM Research Laboratories
 
 This is the README file for building the SNFMulti library and
 SNFMultiTest application using the 64-bit MinGW toolchain.
 
+Prerequisites
+
+  1) Install the 64-bit MinGW compiler in C:\MinGW-64.
+
+  2) Modify the MinGW distribution as follows:
+
+     a) Modify c:\mingw-64\x86_64-w64-mingw32\include\winioctl.h:
+
+     	Change "Unknown" enumeration name to "_Unknown" (at approximately line 490).
+
+     b) Modify c:\mingw-64\x86_64-w64-mingw32\include\math.h:
+
+     	Command out "struct exception;" (at approximately line 15).
+
 To build SNFMulti.dll
 
   1) Run "compileSNFMultiDLL.cmd".  This compiles the SNFMulti files
@@ -34,3 +48,12 @@ To build SNFMultiTest linked with SNFMulti.dll:
    directory, SNFMultiTest.exe can be run from the command line
    without modifying the PATH variable.
 
+To run SNFMultiTest:
+
+  1) Make sure that all DLLs required by MinGW are available to
+     SNFMultiTest.  For example, MinGW-64 with gcc 4.4.0 needs
+     libgcc_s_sjlj-1.dll, which is in \MinGW-64\bin.
+
+  2) Make sure that the sniffer configuration file is named
+     prescale.xml, and is in the current directory.  A suitable
+     configuration file is ..\SNFMultiSDK_Windows_3.1\snf_engine.xml.

MinGW-64/compileSNFMultiDLL.cmd

@@ -1,5 +1,6 @@
 set path=c:\MinGW-64\bin;%path%
 set CXX=x86_64-pc-mingw32-c++
+REM set CXX=c++
 set CXXFLAGS=-I../CodeDweller -I../SNFMulti -mthreads -O3
 del *.o
 %CXX% %CXXFLAGS% -c ../SNFMulti/FilterChain.cpp -o FilterChain.o