feat(win): win 32bit build

Fix #18
DEgITx · Mar 25, 2018 · 80f56aa · 80f56aa
1 parent 40419aa
commit 80f56aa
Show file tree

Hide file tree

Showing 20 changed files with 21 additions and 0 deletions.
diff --git a/imports/win/ia32/iconv.dll b/imports/win/ia32/iconv.dll
diff --git a/imports/win/ia32/indexer.exe b/imports/win/ia32/indexer.exe
diff --git a/imports/win/ia32/indextool.exe b/imports/win/ia32/indextool.exe
diff --git a/imports/win/ia32/libexpat.dll b/imports/win/ia32/libexpat.dll
diff --git a/imports/win/ia32/libmysql.dll b/imports/win/ia32/libmysql.dll
diff --git a/imports/win/ia32/plink.exe b/imports/win/ia32/plink.exe
diff --git a/imports/win/ia32/searchd.exe b/imports/win/ia32/searchd.exe
diff --git a/imports/win/ia32/spelldump.exe b/imports/win/ia32/spelldump.exe
diff --git a/imports/win/ia32/wordbreaker.exe b/imports/win/ia32/wordbreaker.exe
diff --git a/imports/win/iconv.dll → imports/win/x64/iconv.dll b/imports/win/iconv.dll → imports/win/x64/iconv.dll
diff --git a/imports/win/indexer.exe → imports/win/x64/indexer.exe b/imports/win/indexer.exe → imports/win/x64/indexer.exe
diff --git a/imports/win/indextool.exe → imports/win/x64/indextool.exe b/imports/win/indextool.exe → imports/win/x64/indextool.exe
diff --git a/imports/win/libexpat.dll → imports/win/x64/libexpat.dll b/imports/win/libexpat.dll → imports/win/x64/libexpat.dll
diff --git a/imports/win/libmysql.dll → imports/win/x64/libmysql.dll b/imports/win/libmysql.dll → imports/win/x64/libmysql.dll
diff --git a/imports/win/plink.exe → imports/win/x64/plink.exe b/imports/win/plink.exe → imports/win/x64/plink.exe
diff --git a/imports/win/searchd.exe → imports/win/x64/searchd.exe b/imports/win/searchd.exe → imports/win/x64/searchd.exe
diff --git a/imports/win/spelldump.exe → imports/win/x64/spelldump.exe b/imports/win/spelldump.exe → imports/win/x64/spelldump.exe
diff --git a/imports/win/wordbreaker.exe → imports/win/x64/wordbreaker.exe b/imports/win/wordbreaker.exe → imports/win/x64/wordbreaker.exe
diff --git a/package.json b/package.json
@@ -45,6 +45,15 @@
           "from": "./imports/win",
           "to": "."
         }
+      ],
+      "target": [
+        {
+          "target": "nsis",
+          "arch": [
+            "x64",
+            "ia32"
+          ]
+        }
       ]
     },
     "linux": {

diff --git a/src/background/electronAppPath.js b/src/background/electronAppPath.js
@@ -10,10 +10,18 @@ export default (app) => {
     return `./${app}.exe`
   }
 
+  if (/^win/.test(process.platform) && fs.existsSync(`./${process.arch}/${app}.exe`)) {
+    return `./${process.arch}/${app}.exe`
+  }
+
   if(/^win/.test(process.platform) && fs.existsSync(path.dirname(process.execPath) + `/${app}.exe`)) {
     return path.dirname(process.execPath) + `/${app}.exe`
   }
 
+  if(/^win/.test(process.platform) && fs.existsSync(path.dirname(process.execPath) + `/${process.arch}/${app}.exe`)) {
+    return path.dirname(process.execPath) + `/${process.arch}/${app}.exe`
+  }
+
   if (fs.existsSync(fs.realpathSync(__dirname) + `/${app}`)) {
     return fs.realpathSync(__dirname) + `/${app}`
   }
@@ -32,6 +40,10 @@ export default (app) => {
     return `imports/win/${app}.exe`
   }
 
+  if (/^win/.test(process.platform) && fs.existsSync(`imports/win/${process.arch}/${app}.exe`)) {
+    return `imports/win/${process.arch}/${app}.exe`
+  }
+
   if (process.platform === 'linux' && fs.existsSync(`imports/linux/${app}`)) {
     return `imports/linux/${app}`
   }