ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wineandroid: Also set WINEDLLPATH. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2017-07-31 19:48:24 +02:00
parent 56fbca4f44
commit d1abe86771
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/wineandroid.drv/WineActivity.java
View File

@ -78,6 +78,7 @@ private void loadWine( String cmdline )
{ {
File bindir = new File( getFilesDir(), Build.CPU_ABI + "/bin" ); File bindir = new File( getFilesDir(), Build.CPU_ABI + "/bin" );
File libdir = new File( getFilesDir(), Build.CPU_ABI + "/lib" ); File libdir = new File( getFilesDir(), Build.CPU_ABI + "/lib" );
File dlldir = new File( libdir, "wine" );
File prefix = new File( getFilesDir(), "prefix" ); File prefix = new File( getFilesDir(), "prefix" );
File loader = new File( bindir, "wine" ); File loader = new File( bindir, "wine" );
String locale = Locale.getDefault().getLanguage() + "_" + String locale = Locale.getDefault().getLanguage() + "_" +
@ -88,6 +89,7 @@ private void loadWine( String cmdline )
HashMap<String,String> env = new HashMap<String,String>(); HashMap<String,String> env = new HashMap<String,String>();
env.put( "WINELOADER", loader.toString() ); env.put( "WINELOADER", loader.toString() );
env.put( "WINEPREFIX", prefix.toString() ); env.put( "WINEPREFIX", prefix.toString() );
env.put( "WINEDLLPATH", dlldir.toString() );
env.put( "LD_LIBRARY_PATH", libdir.toString() + ":" + getApplicationInfo().nativeLibraryDir ); env.put( "LD_LIBRARY_PATH", libdir.toString() + ":" + getApplicationInfo().nativeLibraryDir );
env.put( "LC_ALL", locale ); env.put( "LC_ALL", locale );
env.put( "LANG", locale ); env.put( "LANG", locale );