From 9496e58a0728ef85ac7a30c98d335522cf1643c4 Mon Sep 17 00:00:00 2001 From: Gerald Pfeifer Date: Sat, 10 Oct 2009 10:34:16 +0000 Subject: Update to Wine 1.1.31. Among others, this includes the following changes: - Vastly improved monthcal control. - Performance improvements for DIB sections. - Several sound driver fixes. - Beginning of ActiveX support in JScript. - More Direct3D 10 work. - More 16-bit dlls split off to separate modules. - Support for attachments in MAPI. - Various bug fixes. Equally importantly, this finally fixes tools/winebuild for FreeBSD. After my general recognition of FreeBSD has been accepted upstream, this is now only one local patch. [1] PR: 137999 [1] Inspired by: Edward Tomasz Napierala [1] --- emulators/wine/files/patch-tools-winebuild | 31 ++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 emulators/wine/files/patch-tools-winebuild (limited to 'emulators/wine/files') diff --git a/emulators/wine/files/patch-tools-winebuild b/emulators/wine/files/patch-tools-winebuild new file mode 100644 index 000000000000..2c988a437568 --- /dev/null +++ b/emulators/wine/files/patch-tools-winebuild @@ -0,0 +1,31 @@ +diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c +index e0cd8bc..6008ef4 100644 +--- tools/winebuild/utils.c ++++ tools/winebuild/utils.c +@@ -297,9 +297,23 @@ const char *get_ld_command(void) + + if (force_pointer_size) + { +- const char *args = (target_platform == PLATFORM_APPLE) ? +- ((force_pointer_size == 8) ? " -arch x86_64" : " -arch i386") : +- ((force_pointer_size == 8) ? " -m elf_x86_64" : " -m elf_i386"); ++ const char *args; ++ ++ switch (target_platform) ++ { ++ case PLATFORM_APPLE: ++ args = (force_pointer_size == 8) ? " -arch x86_64" ++ : " -arch i386"; ++ break; ++ case PLATFORM_FREEBSD: ++ args = (force_pointer_size == 8) ? " -m elf_x86_64" ++ : " -m elf_i386_fbsd"; ++ break; ++ default: ++ args = (force_pointer_size == 8) ? " -m elf_x86_64" ++ : " -m elf_i386"; ++ } ++ + ld_command = xrealloc( ld_command, strlen(ld_command) + strlen(args) + 1 ); + strcat( ld_command, args ); + } -- cgit v1.2.3