summaryrefslogtreecommitdiff
path: root/dist
diff options
context:
space:
mode:
authorTristan Gingold2015-02-09 21:05:28 +0100
committerTristan Gingold2015-02-09 21:05:28 +0100
commit35e2f4cdd1ddcc663daed30681c24494824eb13e (patch)
treeedb16cdcfa7c1d901a4413f9ed6bb51e05ac8af9 /dist
parent037e6e59fd0b8cb988ef1b7941fec6ea05ae1ec7 (diff)
parent89842c536799b0ab5afee6afcde0567c8e18420f (diff)
downloadghdl-35e2f4cdd1ddcc663daed30681c24494824eb13e.tar.gz
ghdl-35e2f4cdd1ddcc663daed30681c24494824eb13e.tar.bz2
ghdl-35e2f4cdd1ddcc663daed30681c24494824eb13e.zip
Merge with tip.
Diffstat (limited to 'dist')
-rw-r--r--dist/mcode/windows/compile.ps14
-rw-r--r--dist/mcode/windows/complib.ps13
2 files changed, 4 insertions, 3 deletions
diff --git a/dist/mcode/windows/compile.ps1 b/dist/mcode/windows/compile.ps1
index 2dea73a..6f208ee 100644
--- a/dist/mcode/windows/compile.ps1
+++ b/dist/mcode/windows/compile.ps1
@@ -212,10 +212,10 @@ elseif ($Compile)
if ($Script_ExitCode -eq 0)
{ #
Write-Host " stripping executable..."
- #& $StripExecutable $GHDLExecutable
+ & $StripExecutable $GHDLExecutable
}
- if ($true) #$Script_ExitCode -eq 0)
+ if ($Script_ExitCode -eq 0)
{ # compile with GNAT
$Parameters = @()
$Parameters += $CFlags
diff --git a/dist/mcode/windows/complib.ps1 b/dist/mcode/windows/complib.ps1
index 29b07da..c7360a4 100644
--- a/dist/mcode/windows/complib.ps1
+++ b/dist/mcode/windows/complib.ps1
@@ -660,7 +660,8 @@ elseif ($Compile)
Set-Location $LocalDir2
$VHDLSrcLibrary = "std"
- foreach ($SourceFile in $SourceFiles[$VHDLSrcLibrary])
+ $VHDLSrcLibraryFiles = "std08"
+ foreach ($SourceFile in $SourceFiles[$VHDLSrcLibraryFiles])
{ Write-Host " file: v08\$SourceFile.v08"
if ($Script_EnableVerbose) { Write-Host " ghdlfilter (-v08)" }
Get-Content "$VHDLSourceLibraryDir\$VHDLSrcLibrary\$SourceFile.vhdl" -Encoding Ascii -Raw `