From 4a763c72d009017378d30d0cb859fd04d3390ad4 Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Thu, 13 Sep 2018 08:55:54 -0700
Subject: [PATCH] cs: repairs for Windows build

---
 racket/src/cs/c/main.c        | 2 ++
 racket/src/worksp/cs/Makefile | 2 +-
 racket/src/worksp/csbuild.rkt | 8 +++++++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/racket/src/cs/c/main.c b/racket/src/cs/c/main.c
index fb5bd23da1..015b7ea192 100644
--- a/racket/src/cs/c/main.c
+++ b/racket/src/cs/c/main.c
@@ -20,6 +20,8 @@ static int scheme_utf8_encode(unsigned int *path, int zero_offset, int len,
 # define RACKET_IS_GUI 0
 #endif
 
+#define XFORM_SKIP_PROC /* empty */
+
 #include "../../start/config.inc"
 
 char *boot_file_data = "BooT FilE OffsetS:xxxxyyyyyzzzz";
diff --git a/racket/src/worksp/cs/Makefile b/racket/src/worksp/cs/Makefile
index 775415a7dc..05172caa15 100644
--- a/racket/src/worksp/cs/Makefile
+++ b/racket/src/worksp/cs/Makefile
@@ -3,7 +3,7 @@ INCS = /I.. /I..\..\rktio /I..\librktio /I$(SCHEME_DIR)\$(MACHINE)\boot\$(MACHIN
 
 RKTIO_LIB = ..\..\build\librktio.lib
 BASE_WIN32_LIBS = WS2_32.lib Shell32.lib User32.lib
-WIN32_LIBS = $(BASE_WIN32_LIBS) RpCrt4.lib Ole32.lib
+WIN32_LIBS = $(BASE_WIN32_LIBS) RpCrt4.lib Ole32.lib Advapi32.lib
 
 LIBS = $(RKTIO_LIB) \
        $(SCHEME_DIR)\$(MACHINE)\boot\$(MACHINE)\$(SCHEME_LIB) \
diff --git a/racket/src/worksp/csbuild.rkt b/racket/src/worksp/csbuild.rkt
index c53a6d147d..11f024c547 100644
--- a/racket/src/worksp/csbuild.rkt
+++ b/racket/src/worksp/csbuild.rkt
@@ -148,9 +148,15 @@
 
 ;; ----------------------------------------
 
+(system*! scheme
+	  "--script"
+	  "../cs/c/convert-to-boot.ss"
+	  "../build/racket.so"
+	  "../build/racket.boot")
+
 (system*! (find-exe)
 	  "../cs/c/embed-boot.rkt"
 	  "../build/raw_racketcs.exe"
 	  "../../RacketCS.exe"
 	  (build-path scheme-dir machine "boot" machine)
-	  "../build/racket.so")
+	  "../build/racket.boot")