Remove dongles and warnings from configura builds.

Copied from Perforce
 Change: 28248
 ServerID: perforce.ravenbrook.com

3 files changed, 12 insertions, 5 deletions

diff --git a/mps/code/commpost.nmk b/mps/code/commpost.nmk
index 030c1637a9f..fb93a6b5735 100644
--- a/mps/code/commpost.nmk
+++ b/mps/code/commpost.nmk
@@ -227,7 +227,7 @@ $(PFM)\$(VARIETY)\mmdw.lib: $(MPMOBJ) $(AMCOBJ) $(DWOBJ) \
 $(PFM)\$(VARIETY)\mps_conf.lib: $(CONFIGURAOBJ) $(AMCOBJ) $(LOOBJ) $(SNCOBJ) \
         $(MVFFOBJ) $(AMSOBJ) $(AWLOBJ)
         $(ECHO) $@
-        $(LIBMAN) $(LIBFLAGS) /OUT:$@ $(DONGLELIB) $**
+        $(LIBMAN) $(LIBFLAGS) /OUT:$@ $**
 
 $(PFM)\$(VARIETY)\mpsplan.lib: $(PLINTHOBJ)
         $(ECHO) $@
diff --git a/mps/code/config.h b/mps/code/config.h
index e8c09964893..ad8ec6f5246 100644
--- a/mps/code/config.h
+++ b/mps/code/config.h
@@ -100,6 +100,15 @@
 /* "unreachable code" (ASSERT, if cond is constantly true). */
 #pragma warning(disable: 4702)
 
+/* "expression evaluates to a function which is missing an argument list" */
+#pragma warning(disable: 4550)
+
+/* "local variable is initialized but not referenced" */
+#pragma warning(disable: 4189)
+
+/* "not all control paths return a value" */
+#pragma warning(disable: 4715)
+
 /* MSVC 2.0 generates a warning when using NOCHECK or UNUSED */
 #ifdef _MSC_VER
 #if _MSC_VER < 1000
@@ -275,9 +284,7 @@
 #define ARENA_INIT_SPARE_COMMIT_LIMIT   ((Size)10uL*1024uL*1024uL)
 #define THREAD_SINGLE
 #define PROTECTION
-#define DONGLE
-/* global dongles have customerID 0 */
-#define DONGLE_CUSTOMER_ID ((int)1)
+#define DONGLE_NONE
 
 #elif defined(CONFIG_PROD_MPS)
 #define MPS_PROD_STRING         "mps"
diff --git a/mps/code/w3i3mv.nmk b/mps/code/w3i3mv.nmk
index cf71b4fef1b..9e76d7cfb5d 100644
--- a/mps/code/w3i3mv.nmk
+++ b/mps/code/w3i3mv.nmk
@@ -28,7 +28,7 @@ SW  = <assert> <ring> <mpm> <bt> <protocol> <boot> \
       <poolepdl> <poolepvm> <poolams> <dbgpool> \
       <abq> <meter> <cbs> <poolmv2> <splay> <version> <poolmvff>
 CONFIGURA = <assert> <ring> <mpm> <bt> <protocol> <boot> \
-      <arenavm> <arenacl> <locus> <arena> <global> <tract> <reserv> <dongle> \
+      <arenavm> <arenacl> <locus> <arena> <global> <tract> <reserv> \
       <pool> <poolabs> <poolmfs> <poolmv> \
       <root> <format> <buffer> <walk> \
       <ref> <trace> <protw3> <proti3> <prmci3w3> <shield> <vmw3> \