widl: Add separate --win32-align and --win64-align options.

[wine] / tools / winewrapper

diff --git a/tools/winewrapper b/tools/winewrapper
index 7c49b38..13be936 100755 (executable)
--- a/tools/winewrapper
+++ b/tools/winewrapper
@@ -16,7 +16,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 #
 
 # first determine the directory that contains the app itself
@@ -66,30 +66,23 @@ if [ "`uname -s`" = "Darwin" ]
 then
   if [ -n "$DYLD_LIBRARY_PATH" ]
   then
-    DYLD_LIBRARY_PATH="$topdir/libs:$DYLD_LIBRARY_PATH"
+    DYLD_LIBRARY_PATH="$topdir/libs/wine:$DYLD_LIBRARY_PATH"
   else
-    DYLD_LIBRARY_PATH="$topdir/libs"
+    DYLD_LIBRARY_PATH="$topdir/libs/wine"
   fi
   export DYLD_LIBRARY_PATH
 else
   if [ -n "$LD_LIBRARY_PATH" ]
   then
-    LD_LIBRARY_PATH="$topdir/libs:$LD_LIBRARY_PATH"
+    LD_LIBRARY_PATH="$topdir/libs/wine:$LD_LIBRARY_PATH"
   else
-    LD_LIBRARY_PATH="$topdir/libs"
+    LD_LIBRARY_PATH="$topdir/libs/wine"
   fi
   export LD_LIBRARY_PATH
 fi
 
-if [ -n "$WINEDLLPATH" ]
-then
-  WINEDLLPATH="$topdir/dlls:$topdir/programs:$WINEDLLPATH"
-else
-  WINEDLLPATH="$topdir/dlls:$topdir/programs"
-fi
-WINESERVER="$topdir/server/wineserver"
 WINELOADER="$topdir/loader/wine"
-export WINEDLLPATH WINESERVER WINELOADER
+export WINELOADER
 
 # any local settings ?
 if [ -f "$topdir/.winewrapper" ]