Made 32 vs. 64-bit model selection for testing automatic.

defs.mak

@@ -25,12 +25,13 @@ AMI_CONFIG := python -m pyibisami.ami_config
 RUN_TESTS  := python -m pyibisami.run_tests
 
 # Machine dependent definitions
+# Note: The "x86_amd64" is NOT an error! It is required, by MSVC v12.0.
 MACHINE ?= X86
 ifeq ($(MACHINE), X86)
     SUFFIX := x86
 else
     ifeq ($(MACHINE), AMD64)
-        SUFFIX := amd64
+        SUFFIX := x86_amd64
     else
         $(error Unrecognized machine type: $(MACHINE))
     endif

example/GNUmakefile

@@ -53,12 +53,22 @@ rx64:
 	MACHINE=AMD64 MODS=$(RX_NAME) INCS='amimodel.h ami_rx.h digital_filter.h fir_filter.h dfe.h' $(MAKE) targs
 
 test_tx:
+ifeq '$(shell python -c "import platform; print platform.architecture()[0]")' '32bit'
+	@echo "Testing 32-bit Tx model..."
+	MACHINE=X86 MODS=$(TX_NAME) TEST_RUNS=test_runs/tx TEST_OUT=test_results/tx/ $(MAKE) test
+else
 	@echo "Testing 64-bit Tx model..."
 	MACHINE=AMD64 MODS=$(TX_NAME) TEST_RUNS=test_runs/tx TEST_OUT=test_results/tx/ $(MAKE) test
+endif
 
 test_rx:
+ifeq '$(shell python -c "import platform; print platform.architecture()[0]")' '32bit'
+	@echo "Testing 32-bit Rx model..."
+	MACHINE=X86 MODS=$(RX_NAME) TEST_RUNS=test_runs/rx TEST_OUT=test_results/rx/ $(MAKE) test
+else
 	@echo "Testing 64-bit Rx model..."
 	MACHINE=AMD64 MODS=$(RX_NAME) TEST_RUNS=test_runs/rx TEST_OUT=test_results/rx/ $(MAKE) test
+endif
 
 txami: $(TX_NAME).ami
 txibs: $(TX_NAME).ibs

example/example_rx.ibs

@@ -5,7 +5,7 @@
 [File Name]  example_rx.ibs
 [File Rev]   v0.1
 
-[Date]       2016-04-05
+[Date]       2016-04-07
 
 [Source]     ibisami, a public domain IBIS-AMI model creation infrastructure
 

example/example_tx.ibs

@@ -5,7 +5,7 @@
 [File Name]  example_tx.ibs
 [File Rev]   v0.1
 
-[Date]       2016-04-05
+[Date]       2016-04-07
 
 [Source]     ibisami, a public domain IBIS-AMI model creation infrastructure