Improve doc.

Remove ortho_code-sysdeps.
Add Pragma convention C in grt for accesses to subprograms.
Fix build on windows.

5 files changed, 6 insertions, 12 deletions

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;