Fix a major Inno setup scripts bug. It was overwriting 32-bit DLLs wi…

…th 64-bit.
pal1000 · Feb 21, 2017 · 41aeaa2 · 41aeaa2
1 parent de803bf
commit 41aeaa2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/mesa-x64.iss b/mesa-x64.iss
@@ -33,9 +33,9 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
 Source: "bin\x86\opengl32sw.dll"; DestDir: "{syswow64}"; Flags: ignoreversion confirmoverwrite
 Source: "bin\x86\swrAVX.dll"; DestDir: "{syswow64}"; Flags: ignoreversion confirmoverwrite
 Source: "bin\x86\swrAVX2.dll"; DestDir: "{syswow64}"; Flags: ignoreversion confirmoverwrite
-Source: "bin\x64\opengl32sw.dll"; DestDir: "{sys}"; Flags: ignoreversion confirmoverwrite
-Source: "bin\x64\swrAVX.dll"; DestDir: "{sys}"; Flags: ignoreversion confirmoverwrite
-Source: "bin\x64\swrAVX2.dll"; DestDir: "{sys}"; Flags: ignoreversion confirmoverwrite
+Source: "bin\x64\opengl32sw.dll"; DestDir: "{win}\system32"; Flags: ignoreversion confirmoverwrite
+Source: "bin\x64\swrAVX.dll"; DestDir: "{win}\system32"; Flags: ignoreversion confirmoverwrite
+Source: "bin\x64\swrAVX2.dll"; DestDir: "{win}\system32"; Flags: ignoreversion confirmoverwrite
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Registry]
@@ -52,6 +52,6 @@ Root: "HKLM32"; Subkey: "SOFTWARE\Microsoft\Windows NT\CurrentVersion\OpenGLDriv
 Type: files; Name: "{syswow64}\opengl32sw.dll"
 Type: files; Name: "{syswow64}\swrAVX.dll"
 Type: files; Name: "{syswow64}\swrAVX2.dll"
-Type: files; Name: "{sys}\opengl32sw.dll"
-Type: files; Name: "{sys}\swrAVX.dll"
-Type: files; Name: "{sys}\swrAVX2.dll"
+Type: files; Name: "{win}\system32\opengl32sw.dll"
+Type: files; Name: "{win}\system32\swrAVX.dll"
+Type: files; Name: "{win}\system32\swrAVX2.dll"
diff --git a/mesa-x86.iss b/mesa-x86.iss
@@ -30,9 +30,9 @@ SolidCompression=yes
 Name: "english"; MessagesFile: "compiler:Default.isl"
 
 [Files]
-Source: "bin\x86\opengl32sw.dll"; DestDir: "{sys}"; Flags: ignoreversion confirmoverwrite
-Source: "bin\x86\swrAVX.dll"; DestDir: "{sys}"; Flags: ignoreversion confirmoverwrite
-Source: "bin\x86\swrAVX2.dll"; DestDir: "{sys}"; Flags: ignoreversion confirmoverwrite
+Source: "bin\x86\opengl32sw.dll"; DestDir: "{win}\system32"; Flags: ignoreversion confirmoverwrite
+Source: "bin\x86\swrAVX.dll"; DestDir: "{win}\system32"; Flags: ignoreversion confirmoverwrite
+Source: "bin\x86\swrAVX2.dll"; DestDir: "{win}\system32"; Flags: ignoreversion confirmoverwrite
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Registry]
@@ -42,6 +42,6 @@ Root: "HKLM"; Subkey: "SOFTWARE\Microsoft\Windows NT\CurrentVersion\OpenGLDriver
 Root: "HKLM"; Subkey: "SOFTWARE\Microsoft\Windows NT\CurrentVersion\OpenGLDrivers\MSOGL"; ValueType: dword; ValueName: "Version"; ValueData: "2"; Flags: createvalueifdoesntexist
 
 [UninstallDelete]
-Type: files; Name: "{sys}\opengl32sw.dll"
-Type: files; Name: "{sys}\swrAVX.dll"
-Type: files; Name: "{sys}\swrAVX2.dll"
+Type: files; Name: "{win}\system32\opengl32sw.dll"
+Type: files; Name: "{win}\system32\swrAVX.dll"
+Type: files; Name: "{win}\system32\swrAVX2.dll"