Windows: more changes to auto-adapt to Visual Studio version

Although newer versions of Visual Studio can open 2010 projects, the
meaning of the project turns out to be: use 2010 tools. So, I've added
a step in the build script to automatically upgrade the solutions and
projects based on the version of Visual Studio that is being run.

Meanwhile, since my previous tests for VS 2012 and VS 2013 were using
VS 2010 projects, I wasn't actually testing with the 2012 and 2013
compilers. Additional changes are needed to make those work, notably a
fresh implementation of setjmp() and longjmp() for Win64.

This was all very painful, but the projects are now in much better
shape, so maybe it won't be so bad from here.

racket/collects/compiler/private/xform.rkt

@@ -81,6 +81,7 @@
 	(hash-set! used-symbols (string->symbol "scheme_thread_local_key") 1)
 	(hash-set! used-symbols (string->symbol "scheme_thread_locals") 1)
 	(hash-set! used-symbols (string->symbol "pthread_getspecific") 1)
+	(hash-set! used-symbols (string->symbol "scheme_get_mz_setjmp") 1)
         
         ;; For dependency tracking:
         (define depends-files (make-hash))
@@ -767,6 +768,9 @@
                       "#define XFORM_RESET_VAR_STACK /* empty */\n"
                       "#define XFORM_RESET_VAR_STACK SET_GC_VARIABLE_STACK((void **)__gc_var_stack__[0]);\n"))
 
+          ;; Indirect setjmp support:
+          (printf "#define scheme_mz_setjmp_post_xform(s) ((scheme_get_mz_setjmp())(s))\n")
+          
           (unless pgc-really?
             (printf "#include \"cgc2.h\"\n"))
           
@@ -860,7 +864,7 @@
         ;; These don't act like functions, but we need to treat them
         ;;  specially:
         (define setjmp-functions
-          '(setjmp _setjmp scheme_setjmp scheme_mz_setjmp))
+          '(setjmp _setjmp scheme_setjmp scheme_mz_setjmp scheme_mz_setjmp_post_xform))
         
         ;; The non-functions table identifies symbols to ignore when
         ;; finding function calls

racket/src/racket/include/mzwin.def

@@ -3,6 +3,7 @@ EXPORTS
  scheme_setjmpup_relative
  scheme_longjmpup
  scheme_reset_jmpup_buf
+ scheme_get_mz_setjmp
  scheme_mz_setjmp
  scheme_mz_longjmp
  scheme_clear_escape

racket/src/racket/include/mzwin3m.def

@@ -3,6 +3,7 @@ EXPORTS
  scheme_setjmpup_relative
  scheme_longjmpup
  scheme_reset_jmpup_buf
+ scheme_get_mz_setjmp
  scheme_mz_setjmp
  scheme_mz_longjmp
  scheme_clear_escape

racket/src/racket/include/scheme.h

@@ -957,7 +957,12 @@ typedef struct Scheme_Env Scheme_Env;
 /*========================================================================*/
 
 #ifdef USE_MZ_SETJMP
+# if defined(_WIN64)
+#  define USE_MZ_SETJMP_INDIRECT
+typedef intptr_t mz_pre_jmp_buf[31];
+# else
 typedef intptr_t mz_pre_jmp_buf[8];
+# endif
 #else
 # define mz_pre_jmp_buf jmp_buf
 #endif
@@ -1008,6 +1013,23 @@ typedef struct Scheme_Continuation_Jump_State {
   char is_kill, is_escape, skip_dws;
 } Scheme_Continuation_Jump_State;
 
+#ifdef USE_MZ_SETJMP_INDIRECT
+/* Needed to avoid a direct reference to scheme_mz_setjmp,
+   which might be implemented in assembly and incompatible
+   with delayloading: */
+typedef int (*Scheme_Setjmp_Proc)(mz_pre_jmp_buf);
+# ifndef MZ_XFORM
+#  define scheme_call_mz_setjmp(s) ((scheme_get_mz_setjmp())(s))
+# else
+#  define scheme_call_mz_setjmp(s) scheme_mz_setjmp_post_xform(s)
+# endif
+#else
+# ifdef USE_MZ_SETJMP
+#  define scheme_call_mz_setjmp(s) scheme_mz_setjmp(s)
+# endif
+typedef int (*Scheme_Setjmp_Proc)(void*);
+#endif
+
 /* A mark position is in odd number, so that it can be
    viewed as a pointer (i.e., a fixnum): */
 #define MZ_MARK_POS_TYPE intptr_t
@@ -1686,20 +1708,20 @@ MZ_EXTERN Scheme_Object *scheme_eval_waiting;
 #ifndef USE_MZ_SETJMP
 # ifdef USE_UNDERSCORE_SETJMP
 #  define scheme_mz_longjmp(b, v) _longjmp(b, v)
-#  define scheme_mz_setjmp(b) _setjmp(b)
+#  define scheme_call_mz_setjmp(b) _setjmp(b)
 # else
 #  define scheme_mz_longjmp(b, v) longjmp(b, v)
-#  define scheme_mz_setjmp(b) setjmp(b)
+#  define scheme_call_mz_setjmp(b) setjmp(b)
 # endif
 #endif
 
 #ifdef MZ_USE_JIT
 MZ_EXTERN void scheme_jit_longjmp(mz_jit_jmp_buf b, int v);
 MZ_EXTERN void scheme_jit_setjmp_prepare(mz_jit_jmp_buf b);
-# define scheme_jit_setjmp(b) (scheme_jit_setjmp_prepare(b), scheme_mz_setjmp((b)->jb))
+# define scheme_jit_setjmp(b) (scheme_jit_setjmp_prepare(b), scheme_call_mz_setjmp((b)->jb))
 #else
 # define scheme_jit_longjmp(b, v) scheme_mz_longjmp(b, v) 
-# define scheme_jit_setjmp(b) scheme_mz_setjmp(b) 
+# define scheme_jit_setjmp(b) scheme_call_mz_setjmp(b)
 #endif
 
 #ifdef MZ_PRECISE_GC

racket/src/racket/sconfig.h

@@ -593,7 +593,7 @@
    the actual size from the executable on startup: */
 # define WINDOWS_DEFAULT_STACK_SIZE 1048576
 
-# ifndef _WIN64
+# if !defined(_WIN64) || (_MSC_VER >= 1600)
 #  define USE_MZ_SETJMP
 # endif
 

racket/src/racket/src/mzsj86.c

@@ -24,7 +24,36 @@
 
 #include "schpriv.h"
 
-#ifndef _WIN64
+#ifdef _WIN64
+
+# ifdef USE_MZ_SETJMP_INDIRECT
+
+/* Implementation in "mzsj86w64.S", and these wrappers make
+   DLL exporting work: */
+
+extern int _scheme_mz_setjmp(mz_pre_jmp_buf b);
+extern void _scheme_mz_longjmp(mz_pre_jmp_buf b, int v);
+
+Scheme_Setjmp_Proc scheme_get_mz_setjmp(void)
+{
+  return _scheme_mz_setjmp;
+}
+
+void scheme_mz_longjmp(mz_pre_jmp_buf b, int v)
+{
+  _scheme_mz_longjmp(b, v);
+}
+
+int scheme_mz_setjmp(mz_pre_jmp_buf b)
+{
+  scheme_log_abort("internal error: setjmp wasn't indirect");
+  abort();
+  return 0;
+}
+
+# endif
+
+#else
 
 int __declspec(naked) scheme_mz_setjmp(mz_jmp_buf b)
 {

racket/src/racket/src/mzsj86w64.S

@@ -0,0 +1,63 @@
+PUBLIC	_scheme_mz_setjmp
+PUBLIC	_scheme_mz_longjmp
+
+_TEXT	SEGMENT
+
+_scheme_mz_setjmp PROC
+	mov [RCX], RBX
+	mov [RCX+08h], RBP
+	mov [RCX+10h], RDI
+	mov [RCX+18h], RSI
+	mov [RCX+20h], RSP
+	mov [RCX+28h], R12
+	mov [RCX+30h], R13
+	mov [RCX+38h], R14
+	mov [RCX+40h], R15
+	stmxcsr [RCX+48h]
+	movdqu [RCX+50h], XMM6
+	movdqu [RCX+60h], XMM7
+	movdqu [RCX+70h], XMM8
+	movdqu [RCX+80h], XMM9
+	movdqu [RCX+90h], XMM10
+	movdqu [RCX+0A0h], XMM11
+	movdqu [RCX+0B0h], XMM12
+	movdqu [RCX+0C0h], XMM13
+	movdqu [RCX+0D0h], XMM14
+	movdqu [RCX+0E0h], XMM15
+	mov RAX, [RSP]
+	mov [RCX+0F0h], RAX
+	mov RAX, 0
+	ret
+_scheme_mz_setjmp ENDP
+	
+_scheme_mz_longjmp PROC
+	mov RBX, [RCX]
+	mov RBP, [RCX+08h]
+	mov RDI, [RCX+10h]
+	mov RSI, [RCX+18h]
+	mov RSP, [RCX+20h]
+	mov R12, [RCX+28h]
+	mov R13, [RCX+30h]
+	mov R14, [RCX+38h]
+	mov R15, [RCX+40h]
+	ldmxcsr [RCX+48h]
+	movdqu XMM6, [RCX+50h]
+	movdqu XMM7, [RCX+60h]
+	movdqu XMM8, [RCX+70h]
+	movdqu XMM9, [RCX+80h]
+	movdqu XMM10, [RCX+90h]
+	movdqu XMM11, [RCX+0A0h]
+	movdqu XMM12, [RCX+0B0h]
+	movdqu XMM13, [RCX+0C0h]
+	movdqu XMM14, [RCX+0D0h]
+	movdqu XMM15, [RCX+0E0h]
+	mov RAX, [RCX+0F0h]
+	mov [RSP], RAX
+	mov RAX, RDX
+	ret
+_scheme_mz_longjmp ENDP
+
+_TEXT ENDS
+	
+END
+

racket/src/racket/src/schemef.h

@@ -42,6 +42,7 @@ MZ_EXTERN void scheme_longjmpup(Scheme_Jumpup_Buf *b);
 MZ_EXTERN void scheme_reset_jmpup_buf(Scheme_Jumpup_Buf *b);
 
 #ifdef USE_MZ_SETJMP
+MZ_EXTERN Scheme_Setjmp_Proc scheme_get_mz_setjmp(void);
 MZ_EXTERN int scheme_mz_setjmp(mz_pre_jmp_buf b);
 MZ_EXTERN void scheme_mz_longjmp(mz_pre_jmp_buf b, int v);
 #endif

racket/src/racket/src/schemex.h

@@ -22,6 +22,7 @@ int (*scheme_setjmpup_relative)(Scheme_Jumpup_Buf *b, void *base,
 void (*scheme_longjmpup)(Scheme_Jumpup_Buf *b);
 void (*scheme_reset_jmpup_buf)(Scheme_Jumpup_Buf *b);
 #ifdef USE_MZ_SETJMP
+Scheme_Setjmp_Proc (*scheme_get_mz_setjmp)(void);
 int (*scheme_mz_setjmp)(mz_pre_jmp_buf b);
 void (*scheme_mz_longjmp)(mz_pre_jmp_buf b, int v);
 #endif
@@ -952,8 +953,7 @@ int (*scheme_is_list)(Scheme_Object *obj1);
 int (*scheme_list_length)(Scheme_Object *list);
 int (*scheme_proper_list_length)(Scheme_Object *list);
 Scheme_Object *(*scheme_alloc_list)(int size);
-Scheme_Object *(*scheme_map_1)(Scheme_Object *(*f)(Scheme_Object*),
+Scheme_Object *(*scheme_map_1)(Scheme_Object *(*f)(Scheme_Object*), Scheme_Object *l);
-			    Scheme_Object *l);
 Scheme_Object *(*scheme_car)(Scheme_Object *pair);
 Scheme_Object *(*scheme_cdr)(Scheme_Object *pair);
 Scheme_Object *(*scheme_cadr)(Scheme_Object *pair);

racket/src/racket/src/schemex.inc

@@ -3,6 +3,7 @@
   scheme_extension_table->scheme_longjmpup = scheme_longjmpup;
   scheme_extension_table->scheme_reset_jmpup_buf = scheme_reset_jmpup_buf;
 #ifdef USE_MZ_SETJMP
+  scheme_extension_table->scheme_get_mz_setjmp = scheme_get_mz_setjmp;
   scheme_extension_table->scheme_mz_setjmp = scheme_mz_setjmp;
   scheme_extension_table->scheme_mz_longjmp = scheme_mz_longjmp;
 #endif

racket/src/racket/src/schemexm.h

@@ -3,6 +3,7 @@
 #define scheme_longjmpup (scheme_extension_table->scheme_longjmpup)
 #define scheme_reset_jmpup_buf (scheme_extension_table->scheme_reset_jmpup_buf)
 #ifdef USE_MZ_SETJMP
+#define scheme_get_mz_setjmp (scheme_extension_table->scheme_get_mz_setjmp)
 #define scheme_mz_setjmp (scheme_extension_table->scheme_mz_setjmp)
 #define scheme_mz_longjmp (scheme_extension_table->scheme_mz_longjmp)
 #endif

racket/src/racket/src/setjmpup.c

@@ -716,3 +716,13 @@ void scheme_mz_longjmp(mz_pre_jmp_buf b, int v)
 }
 
 #endif
+
+
+#ifndef USE_MZ_SETJMP_INDIRECT
+Scheme_Setjmp_Proc scheme_get_mz_setjmp(void)
+{
+  scheme_log_abort("internal error: setjmp was indirect?");
+  abort();
+  return NULL;
+}
+#endif

racket/src/worksp/.gitignore

@@ -9,11 +9,18 @@
 
 # files generated by Visual Studio
 */*.ncb
+*/*.opensdf
 */*.suo
 */*.sdf
 */*.sln.cache
 
+# potentially generated by "genvsx"
+*/*X.vcxproj
+*/*X.sln
+
 checkvs9.obj
 checkvs9.exe
+genvsx.obj
+genvsx.exe
 rbuildmode.obj
 rbuildmode.exe

racket/src/worksp/README

@@ -77,11 +77,16 @@ The CGC source code for RacketCGC and GRacketCGC is split into several
 projects that are grouped into a few solutions.  To build the `X'
 solution with Visual Studio, open the file racket\src\worksp\X\X.sln,
 but add `9' before ".sln" if you're using Visual Studio 2008 (i.e.,
-version 9.0).
+version 9.0). The solution files without a number are for Visual
+Studio 2010, but they should upgrade immediately for later versions.
 
  [The .vcproj files are used by the ...9.sln solutions, while the
-  .vcxproj files are used by the other .sln solutions. The latter
+  .vcxproj files are used by the other .sln solutions. The latter are
-  are compatible with Visual Studio 2010 and up.]
+  compatible with Visual Studio 2010. For Visual Studio versions later
+  than 2010, "build.bat" script auto-upgrades projects in a copy whose
+  file name ends with a literal "X" to match the current tool version,
+  but you can also just upgrade them within your version of Visual
+  Studio.]
 
 To build RacketCGC, build the Racket solution in
   racket\src\worksp\racket - makes racket\RacketCGC.exe

racket/src/worksp/build.bat

@@ -8,6 +8,10 @@ cl checkvs9.c
 checkvs9.exe
 if errorlevel 1 (set PLTSLNVER=9)
 
+cl genvsx.c
+genvsx.exe
+if errorlevel 1 (set PLTSLNVER=X)
+
 if not exist ..\..\etc  mkdir ..\..\etc
 if not exist ..\..\doc  mkdir ..\..\doc
 if not exist ..\..\share  mkdir ..\..\share

racket/src/worksp/gc2/make.rkt

@@ -160,18 +160,26 @@
 			   (check-timestamp t2 f)
 			   (>= t t2)))
 		       deps))))
-    (unless (system- (format "~a ~a /MT /Zi ~a /c ~a /Fdxsrc/ /Fo~a" cl.exe flags opt-flags c o))
+    (unless (system- (format "~a ~a /MT /Zi /GS- ~a /c ~a /Fdxsrc/ /Fo~a" cl.exe flags opt-flags c o))
       (error "failed compile"))))
 
 (define common-deps (list "../../racket/gc2/xform.rkt"
 			  "../../racket/gc2/xform-mod.rkt"))
 
 (define (find-build-file d f)
+  (define (find-release d2)
+    ;; An ".obj" location may depend on whether CGC was
+    ;; built with SGC or the Boehm GC
+    (or (for/or ([d '("srelease" "brelease")])
+          (define p (string-append d2 d "/"))
+          (and (file-exists? (build-path p f))
+               p))
+        (string-append d2 "release/")))
   (string-append
    (if win64?
-     (string-append "../" d "/x64/release")
+     (find-release (string-append "../" d "/x64/"))
-     (let ([d2 (string-append "../" d "/win32/release")])
+     (let ([d2 (find-release (string-append "../" d "/win32/"))])
-       (if (directory-exists? d2) d2 (string-append "../" d "/release"))))
+       (if (directory-exists? d2) d2 (find-release (string-append "../" d "/")))))
    "/" f))
 
 ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -306,7 +314,13 @@
 	     "xsrc/foreign.obj"
 	     (find-build-file "libracket" "gmp.obj")
 	     (find-build-file "racket" "libffi.lib")
-	     (map (lambda (n) (format "xsrc/~a.obj" n)) srcs))])
+             (append
+              (let ([f (and win64?
+                            (find-build-file "libracket" "mzsj86w64.obj"))])
+                (if (and f (file-exists? f))
+                    (list f)
+                    null))
+              (map (lambda (n) (format "xsrc/~a.obj" n)) srcs)))])
   (link-dll objs null null dll "" #f))
 
 (define (check-rc res rc)

racket/src/worksp/genvsx.c

@@ -0,0 +1,108 @@
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+/* Generate racketX.sln from racket.sln, etc., to match the 
+   current VS tool chain */
+
+static const char *solutions[] = { "gracket/gracket.sln",
+                                   "mzstart/mzstart.sln",
+                                   "mrstart/mrstart.sln",
+                                   "racket/racket.sln",
+                                   "mzcom/mzcom.sln",
+                                   NULL };
+
+static const char *projects[] = { "gracket/gracket.vcxproj",
+                                  "libracket/libracket.vcxproj",
+                                  "mzstart/mzstart.vcxproj",
+                                  "libffi/libffi.vcxproj",
+                                  "mrstart/mrstart.vcxproj",
+                                  "racket/racket.vcxproj",
+                                  "libmzgc/libmzgc.vcxproj",
+                                  "mzcom/mzcom.vcxproj",
+                                  "sgc/sgc.vcxproj",
+                                  NULL };
+
+static const char *tool_prefix = "<PlatformToolset>v";
+static const char *filename_suffix = ".vcxproj";
+
+static void adjust_file(const char *fn, const char *vers) {
+  char *new_fn;
+  int i, j, tool_pos, filename_pos;
+  FILE *f, *new_f;
+
+  new_fn = malloc(strlen(fn) + 2);
+  for (i = 0, j = 0; fn[i]; i++, j++) {
+    if (fn[i] == '.')
+      new_fn[j++] = 'X';
+    new_fn[j] = fn[i];
+  }
+  new_fn[j] = 0;
+
+  f = fopen(fn, "r");
+  new_f = fopen(new_fn, "w");
+
+  tool_pos = 0;
+  filename_pos = 0;
+  while (1) {
+    i = fgetc(f);
+
+    if (i == EOF)
+      break;
+
+    if (i == tool_prefix[tool_pos])
+      tool_pos++;
+    else
+      tool_pos = 0;
+
+    if (i && (i == filename_suffix[filename_pos])) {
+      /* don't write potential suffix until we know whether it matches... */
+      filename_pos++;
+    } else {
+      if (filename_pos) {
+        if (!filename_suffix[filename_pos]) {
+          /* found matching suffix, so add "X" before: */
+          fwrite("X", 1, 1, new_f);
+        }
+        fwrite(filename_suffix, 1, filename_pos, new_f);
+        filename_pos = 0;
+      }
+      fputc(i, new_f);
+    }
+
+    if (!tool_prefix[tool_pos]) {
+      /* found matching tool prefix, so adjust version */
+      fwrite(vers, 1, strlen(vers), new_f);
+      tool_pos = 0;
+      fgetc(f); fgetc(f); fgetc(f); /* = "100" */
+    }
+  }
+
+  fclose(f);
+  fclose(new_f);
+}
+
+int main() {
+  const char *vers = "100";
+  int i;
+
+#if _MSC_VER >= 1800
+  /* VS 2013 */
+  vers = "120";
+#elif _MSC_VER >= 1700
+  /* VS 2012 */
+  vers = "110";
+#else
+  /* VS 2010 or earlier */
+  return 0;
+#endif
+
+  for (i = 0; solutions[i]; i++) {
+    adjust_file(solutions[i], vers);
+  }
+  for (i = 0; projects[i]; i++) {
+    adjust_file(projects[i], vers);
+  }
+
+  return 1;
+}

racket/src/worksp/gracket/gracket.vcxproj

@@ -53,9 +53,10 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
-    <TargetName>$(ProjectName)CGC</TargetName>
+    <TargetName>GracketCGC</TargetName>
     <OutDir>..\..\..\lib\</OutDir>
     <IntDir>$(Platform)\$(Configuration)\</IntDir>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
@@ -65,6 +66,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

racket/src/worksp/libffi/libffi.vcxproj

@@ -60,63 +60,55 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+    <TargetName>libffi</TargetName>
     <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(Platform)\$(Configuration)\</IntDir>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+  <ItemDefinitionGroup>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\libffi;..\..\foreign\libffi\include;..\..\foreign\libffi\src\x86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\libffi;..\..\foreign\libffi\include;..\..\foreign\libffi\src\x86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\libffi;..\..\foreign\libffi\include;..\..\foreign\libffi\src\x86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\libffi;..\..\foreign\libffi\include;..\..\foreign\libffi\src\x86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>

racket/src/worksp/libmzgc/libmzgc.vcxproj

@@ -64,68 +64,53 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
-    <TargetName>$(ProjectName)xxxxxxx</TargetName>
+    <TargetName>libmzgcxxxxxxx</TargetName>
     <OutDir>..\..\..\lib\</OutDir>
     <IntDir>$(Platform)\$(Configuration)\</IntDir>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+  <ItemDefinitionGroup>
     <ClCompile>
-      <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\Racket\Gc\Include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;GC_BUILD;MD_LIB_MAIN;SILENT;OLD_BLOCK_ALLOC;LARGE_CONFIG;ATOMIC_UNCOLLECTABLE;INITIAL_MARK_STACK_SIZE=8192;GC_DLL;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>User32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\..\..\lib\$(ProjectName)xxxxxxx.dll</OutputFile>
+      <OutputFile>..\..\..\lib\libmzgcxxxxxxx.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
-      <ImportLibrary>..\..\..\lib\msvc\$(ProjectName)xxxxxxx.lib</ImportLibrary>
+      <ImportLibrary>..\..\..\lib\msvc\libmzgcxxxxxxx.lib</ImportLibrary>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;GC_BUILD;MD_LIB_MAIN;SILENT;OLD_BLOCK_ALLOC;LARGE_CONFIG;ATOMIC_UNCOLLECTABLE;INITIAL_MARK_STACK_SIZE=8192;GC_DLL;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\Racket\Gc\Include</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;GC_BUILD;MD_LIB_MAIN;SILENT;OLD_BLOCK_ALLOC;LARGE_CONFIG;ATOMIC_UNCOLLECTABLE;INITIAL_MARK_STACK_SIZE=8192;GC_DLL;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
     </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
     <Link>
-      <AdditionalOptions>/MACHINE:X64 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>User32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\..\..\lib\$(ProjectName)xxxxxxx.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>..\..\..\lib\msvc\$(ProjectName)xxxxxxx.lib</ImportLibrary>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -134,64 +119,23 @@
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>..\..\Racket\Gc\Include</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;GC_BUILD;SILENT;OLD_BLOCK_ALLOC;LARGE_CONFIG;ATOMIC_UNCOLLECTABLE;INITIAL_MARK_STACK_SIZE=8192;GC_DLL;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
     </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>User32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\..\..\lib\$(ProjectName)xxxxxxx.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>..\..\..\lib\msvc\$(ProjectName)xxxxxxx.lib</ImportLibrary>
-    </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>..\..\Racket\Gc\Include</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;GC_BUILD;SILENT;OLD_BLOCK_ALLOC;LARGE_CONFIG;ATOMIC_UNCOLLECTABLE;INITIAL_MARK_STACK_SIZE=8192;GC_DLL;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
     </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
     <Link>
-      <AdditionalDependencies>User32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\..\..\lib\$(ProjectName)xxxxxxx.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>..\..\..\lib\msvc\$(ProjectName)xxxxxxx.lib</ImportLibrary>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>

racket/src/worksp/libracket/libracket.vcxproj

@@ -53,9 +53,10 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
-    <TargetName>$(ProjectName)xxxxxxx</TargetName>
+    <TargetName>libracketxxxxxxx</TargetName>
     <OutDir>..\..\..\lib\</OutDir>
     <IntDir>$(Platform)\$(Configuration)\</IntDir>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
@@ -66,6 +67,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -226,6 +228,12 @@
     <ClCompile Include="..\..\racket\src\validate.c" />
     <ClCompile Include="..\..\racket\src\vector.c" />
   </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\..\racket\src\mzsj86w64.S">
+      <Command Condition="'$(Platform)'=='x64'">ml64.exe /c /Cx /Fo $(Platform)\$(Configuration)\mzsj86w64.obj ..\..\racket\src\mzsj86w64.S</Command>
+      <Outputs>$(Platform)\$(Configuration)\mzsj86w64.obj;%(Outputs)</Outputs>
+    </CustomBuild>
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\libffi\libffi.vcxproj">
       <Project>{7db29f1e-06fd-4e39-97ff-1c7922f6901a}</Project>

racket/src/worksp/mrstart/mrstart.vcxproj

@@ -39,6 +39,7 @@
     <OutDir>..\..\..\lib\</OutDir>
     <IntDir>$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Midl>
@@ -46,7 +47,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>..\..\..\lib\$(ProjectName).tlb</TypeLibraryName>
+      <TypeLibraryName>..\..\..\lib\mrstart.tlb</TypeLibraryName>
     </Midl>
     <ClCompile>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
@@ -68,10 +69,10 @@
     <Link>
       <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>user32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\..\..\lib\$(ProjectName).exe</OutputFile>
+      <OutputFile>..\..\..\lib\mrstart.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>..\..\..\lib\$(ProjectName).pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>..\..\..\lib\mrstart.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -84,7 +85,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>..\..\..\lib\$(ProjectName).tlb</TypeLibraryName>
+      <TypeLibraryName>..\..\..\lib\mrstart.tlb</TypeLibraryName>
     </Midl>
     <ClCompile>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
@@ -105,10 +106,10 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>user32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\..\..\lib\$(ProjectName).exe</OutputFile>
+      <OutputFile>..\..\..\lib\mrstart.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>..\..\..\lib\$(ProjectName).pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>..\..\..\lib\mrstart.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>

racket/src/worksp/mzcom/mzcom.vcxproj

@@ -61,14 +61,15 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
-    <TargetName>$(ProjectName)CGC</TargetName>
+    <TargetName>mzcomCGC</TargetName>
     <OutDir>..\..\..\lib\</OutDir>
     <IntDir>$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <Midl>
-      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>
+      <TypeLibraryName>$(OutDir)mzcom.tlb</TypeLibraryName>
     </Midl>
     <ClCompile>
       <AdditionalIncludeDirectories>..;..\..\racket\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -77,6 +78,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -86,10 +88,10 @@
     <Link>
       <AdditionalOptions>/DELAYLOAD:libracketxxxxxxx.dll /DELAYLOAD:libmzgcxxxxxxx.dll %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>delayimp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\..\..\lib\$(ProjectName)CGC.exe</OutputFile>
+      <OutputFile>..\..\..\lib\mzcomCGC.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>..\..\..\lib\$(ProjectName)CGC.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>..\..\..\lib\mzcomCGC.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <StackReserveSize>8388608</StackReserveSize>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -201,8 +203,8 @@
     <Link>
       <AdditionalOptions>/DELAYLOAD:libracket3mxxxxxxx.dll %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>delayimp.lib;..\..\..\lib\msvc\libracket3mxxxxxxx.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\..\..\lib\$(ProjectName).exe</OutputFile>
+      <OutputFile>..\..\..\lib\mzcom.exe</OutputFile>
-      <ProgramDatabaseFile>..\..\..\lib\$(ProjectName).pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>..\..\..\lib\mzcom.pdb</ProgramDatabaseFile>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='3m|x64'">
@@ -221,8 +223,8 @@
     <Link>
       <AdditionalOptions>/DELAYLOAD:libracket3mxxxxxxx.dll %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>delayimp.lib;..\..\..\lib\msvc\libracket3mxxxxxxx.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\..\..\lib\$(ProjectName).exe</OutputFile>
+      <OutputFile>..\..\..\lib\mzcom.exe</OutputFile>
-      <ProgramDatabaseFile>..\..\..\lib\$(ProjectName).pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>..\..\..\lib\mzcom.pdb</ProgramDatabaseFile>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>

racket/src/worksp/mzstart/mzstart.vcxproj

@@ -39,6 +39,7 @@
     <OutDir>..\..\..\lib\</OutDir>
     <IntDir>$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -60,10 +61,10 @@
     </ResourceCompile>
     <Link>
       <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>..\..\..\lib\$(ProjectName).exe</OutputFile>
+      <OutputFile>..\..\..\lib\mzstart.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>..\..\..\lib\$(ProjectName).pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>..\..\..\lib\mzstart.pdb</ProgramDatabaseFile>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -89,10 +90,10 @@
       <AdditionalIncludeDirectories>..\starters</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <OutputFile>..\..\..\lib\$(ProjectName).exe</OutputFile>
+      <OutputFile>..\..\..\lib\mzstart.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>..\..\..\lib\$(ProjectName).pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>..\..\..\lib\mzstart.pdb</ProgramDatabaseFile>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>

racket/src/worksp/racket/racket.vcxproj

@@ -42,6 +42,7 @@
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -53,7 +54,7 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
-    <TargetName>$(ProjectName)CGC</TargetName>
+    <TargetName>RacketCGC</TargetName>
     <OutDir>..\..\..\</OutDir>
     <IntDir>$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
@@ -66,6 +67,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

racket/src/worksp/sgc/sgc.vcxproj

@@ -63,23 +63,33 @@
     <OutDir>..\..\..\lib\</OutDir>
     <IntDir>$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
+    <TargetName>libmzgcxxxxxxx</TargetName>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+  <ItemDefinitionGroup>
     <ClCompile>
-      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SGC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <PrecompiledHeader></PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
     </ClCompile>
     <Link>
       <OutputFile>..\..\..\lib\libmzgcxxxxxxx.dll</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <ImportLibrary>..\..\..\lib\msvc\libmzgcxxxxxxx.lib</ImportLibrary>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SGC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+    </ClCompile>
+    <Link>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -87,18 +97,10 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SGC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <OutputFile>..\..\..\lib\libmzgcxxxxxxx.dll</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>..\..\..\lib\msvc\libmzgcxxxxxxx.lib</ImportLibrary>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -106,22 +108,13 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SGC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <OutputFile>..\..\..\lib\libmzgcxxxxxxx.dll</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <ImportLibrary>..\..\..\lib\msvc\libmzgcxxxxxxx.lib</ImportLibrary>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -129,22 +122,13 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SGC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <OutputFile>..\..\..\lib\libmzgcxxxxxxx.dll</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <ImportLibrary>..\..\..\lib\msvc\libmzgcxxxxxxx.lib</ImportLibrary>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>