made win32 path configurable

CVS patchset: 278
CVS date: 2001/07/14 16:55:11

2 files changed, 5 insertions, 9 deletions

diff --git a/src/libw32dll/wine/driver.c b/src/libw32dll/wine/driver.c
index 53d82ccb5..1a1c99bf7 100644
--- a/src/libw32dll/wine/driver.c
+++ b/src/libw32dll/wine/driver.c
@@ -107,13 +107,8 @@ void DrvClose(HDRVR hdrvr)
     DrvFree(hdrvr);
 }
 
-
-#ifdef WIN32_PATH
-char* def_path=WIN32_PATH;	    // path to codecs
-#else
-char* def_path="/usr/lib/win32";    // path to codecs
-#endif
 char* win32_codec_name=NULL;  // must be set before calling DrvOpen() !!!
+char* win32_def_path  =NULL;  // must be set before calling DrvOpen() !!!
 
 HDRVR
 DrvOpen(LPARAM lParam2)
diff --git a/src/libw32dll/wine/win32.c b/src/libw32dll/wine/win32.c
index df06fe53b..b4ec59ef3 100644
--- a/src/libw32dll/wine/win32.c
+++ b/src/libw32dll/wine/win32.c
@@ -1215,16 +1215,17 @@ int WINAPI expGetModuleFileNameA(int module, char* s, int len)
 int WINAPI expSetUnhandledExceptionFilter(void* filter)
 {
     dbgprintf("SetUnhandledExcFilter\n");
-    return 1;//unsupported and probably won't ever be supported
+    return 1;/*unsupported and probably won't ever be supported */
 }    
-extern char* def_path;
+
+extern char* win32_def_path;
 
 int WINAPI expLoadLibraryA(char* name)
 {
     char qq[256];
     dbgprintf("LoadLibraryA\n");
     printf("They want library %s\n", name);
-    strcpy(qq, def_path);
+    strcpy(qq, win32_def_path);
     strcat(qq, "/");
     strcat(qq, name);
     return LoadLibraryA(qq);