9 files changed, 11 insertions, 13 deletions
diff --git a/translate/grt/grt-processes.ads b/translate/grt/grt-processes.ads
index b59a5b131..3218d7286 100644
--- a/translate/grt/grt-processes.ads
+++ b/translate/grt/grt-processes.ads
@@ -127,6 +127,7 @@ package Grt.Processes is
 private
    --  Access to a process subprogram.
    type Proc_Acc is access procedure (Self : System.Address);
+   pragma Convention (C, Proc_Acc);
 
    --  State of a process.
    type Process_State is
diff --git a/translate/grt/grt-signals.adb b/translate/grt/grt-signals.adb
index 8704aab36..fc2407794 100644
--- a/translate/grt/grt-signals.adb
+++ b/translate/grt/grt-signals.adb
@@ -1804,6 +1804,7 @@ package body Grt.Signals is
    end Compute_Resolved_Signal;
 
    type Conversion_Func_Acc is access procedure (Instance : System.Address);
+   pragma Convention (C, Conversion_Func_Acc);
    function To_Conversion_Func_Acc is new Ada.Unchecked_Conversion
      (Source => System.Address, Target => Conversion_Func_Acc);
 
diff --git a/translate/grt/grt-signals.ads b/translate/grt/grt-signals.ads
index bab73ce10..79d6e55ec 100644
--- a/translate/grt/grt-signals.ads
+++ b/translate/grt/grt-signals.ads
@@ -76,7 +76,8 @@ package Grt.Signals is
 
    --  Function access type used to evaluate the guard expression.
    type Guard_Func_Acc is access function (This : System.Address)
-     return Ghdl_B2;
+                                          return Ghdl_B2;
+   pragma Convention (C, Guard_Func_Acc);
 
    --  Simply linked list of processes to be resumed in case of events.
 
diff --git a/translate/grt/grt-vpi.ads b/translate/grt/grt-vpi.ads
index a7f06f77a..694db8c1a 100644
--- a/translate/grt/grt-vpi.ads
+++ b/translate/grt/grt-vpi.ads
@@ -137,6 +137,7 @@ package Grt.Vpi is
      (Source => Address, Target => p_cb_data);
 
    type cb_rtn_type is access function (Cb : p_cb_data) return Integer;
+   pragma Convention (C, cb_rtn_type);
 
    type s_cb_data is record
       Reason : Integer;
diff --git a/translate/mcode/winbuild.bat b/translate/mcode/winbuild.bat
index bbe031d61..8c2826852 100644
--- a/translate/mcode/winbuild.bat
+++ b/translate/mcode/winbuild.bat
@@ -7,7 +7,7 @@ if errorlevel 1 goto end
 gnatmake windows/ghdlversion -o windows/ghdlversion.exe
 windows\ghdlversion < ../../version.ads > windows/version.nsi
 
-"f:\Program Files\NSIS\makensis" windows\ghdl.nsi
+"c:\Program Files\NSIS\makensis" windows\ghdl.nsi
 if errorlevel 1 goto end
 
 exit /b 0
diff --git a/translate/mcode/windows/compile.bat b/translate/mcode/windows/compile.bat
index be0aaecc4..c668ef0e2 100644
--- a/translate/mcode/windows/compile.bat
+++ b/translate/mcode/windows/compile.bat
@@ -8,7 +8,7 @@ gcc -c %CFLAGS% ../../grt/grt-cvpi.c
 gcc -c %CFLAGS% ../../grt/config/clock.c
 gcc -c %CFLAGS% ../../../ortho/mcode/memsegs_c.c
 gcc -c %CFLAGS% -DWITH_GNAT_RUN_TIME ../../grt/config/win32.c
-gnatmake %CFLAGS% -gnatn -aI../windows -aI../../.. -aI../.. -aI../../ghdldrv -aI../../grt -aI../../../ortho/mcode ghdl_mcode -o ghdl.exe -largs grt-cbinding.o clock.o grt-cvpi.o memsegs_c.o win32.o -largs -Wl,--stack,8404992
+gnatmake %CFLAGS% -gnatn -aI../windows -aI../../.. -aI../.. -aI../../ghdldrv -aI../../../psl -aI../../grt -aI../../../ortho/mcode ghdl_mcode -aI../../../ortho -o ghdl.exe -largs grt-cbinding.o clock.o grt-cvpi.o memsegs_c.o win32.o -largs -Wl,--stack,8404992
 
 if errorlevel 1 goto failed
 
@@ -21,4 +21,4 @@ exit /b 0
 echo "Compilation failed"
 cd ..
 exit /b 1
-
-\ No newline at end of file
+
diff --git a/translate/mcode/windows/ghdl.nsi b/translate/mcode/windows/ghdl.nsi
index 528a7dfb4..aa4d559aa 100644
--- a/translate/mcode/windows/ghdl.nsi
+++ b/translate/mcode/windows/ghdl.nsi
@@ -149,7 +149,7 @@ SectionEnd
 
 Section "Documentation (Recommended)"
   SetOutPath $INSTDIR
-  File ghdl.htm
+  File /oname=ghdl.htm ..\..\..\doc\ghdl.html
 SectionEnd
 
 Section "Add in PATH (Recommended)"
diff --git a/translate/mcode/windows/ortho_code-sysdeps.adb b/translate/mcode/windows/ortho_code-sysdeps.adb
deleted file mode 100644
index dbff7b60c..000000000
--- a/translate/mcode/windows/ortho_code-sysdeps.adb
+++ /dev/null
@@ -1,8 +0,0 @@
-with Ortho_Code.X86.Flags;
-
-package body Ortho_Code.Sysdeps is
-   procedure Init is
-   begin
-      Ortho_Code.X86.Flags.Flag_Alloca_Call := True;
-   end Init;
-end Ortho_Code.Sysdeps;
diff --git a/translate/mcode/windows/ortho_code-x86-flags.ads b/translate/mcode/windows/ortho_code-x86-flags.ads
new file mode 100644
index 000000000..8915f3122
--- /dev/null
+++ b/translate/mcode/windows/ortho_code-x86-flags.ads
@@ -0,0 +1,2 @@
+with Ortho_Code.X86.Flags_Windows;
+package Ortho_Code.X86.Flags renames Ortho_Code.X86.Flags_Windows;