backup/OpenDX
1
0
Fork 0
mirror of https://github.com/EduApps-CDG/OpenDX synced 2024-12-30 09:45:37 +01:00
Code Issues Projects Releases Activity

Work around build failure with winegcc/clang. (#1184)

Browse Source 
Fixes #1182.
This commit is contained in:
orbea 2019-09-05 09:01:33 -07:00 committed by Philip Rebohle
parent 5ea5d2a816
commit c57e63f7d2
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build-wine32.txt
View File

@ -8,7 +8,7 @@ strip = 'strip'
needs_exe_wrapper = true needs_exe_wrapper = true
c_args=['-m32', '-msse', '-msse2', '-fvisibility=hidden'] c_args=['-m32', '-msse', '-msse2', '-fvisibility=hidden']
cpp_args=['-m32', '--no-gnu-unique', '-msse', '-msse2', '-fvisibility=hidden', '-fvisibility-inlines-hidden', '-D__WIDL_objidl_generated_name_0000000C='] cpp_args=['-m32', '-msse', '-msse2', '-fvisibility=hidden', '-fvisibility-inlines-hidden', '-D__WIDL_objidl_generated_name_0000000C=']
cpp_link_args=['-m32', '-mwindows'] cpp_link_args=['-m32', '-mwindows']
[host_machine] [host_machine]

2
build-wine64.txt
View File

@ -8,7 +8,7 @@ strip = 'strip'
needs_exe_wrapper = true needs_exe_wrapper = true
c_args=['-m64', '-fvisibility=hidden'] c_args=['-m64', '-fvisibility=hidden']
cpp_args=['-m64', '--no-gnu-unique', '-fvisibility=hidden', '-fvisibility-inlines-hidden', '-D__WIDL_objidl_generated_name_0000000C='] cpp_args=['-m64', '-fvisibility=hidden', '-fvisibility-inlines-hidden', '-D__WIDL_objidl_generated_name_0000000C=']
cpp_link_args=['-m64', '-mwindows'] cpp_link_args=['-m64', '-mwindows']
[host_machine] [host_machine]

3
meson.build
View File

@ -33,6 +33,9 @@ dxvk_winelib = dxvk_compiler.compiles(code, name: 'winelib check')
dxvk_extradep = [ ] dxvk_extradep = [ ]
if dxvk_winelib if dxvk_winelib
if dxvk_compiler.has_argument('--no-gnu-unique')
add_project_arguments('--no-gnu-unique', language : ['cpp'])
endif
wrc = find_program('wrc') wrc = find_program('wrc')
lib_vulkan = declare_dependency(link_args: [ '-lwinevulkan' ]) lib_vulkan = declare_dependency(link_args: [ '-lwinevulkan' ])
lib_d3d11 = declare_dependency(link_args: [ '-ld3d11' ]) lib_d3d11 = declare_dependency(link_args: [ '-ld3d11' ])

9
src/util/util_bit.h
View File

@ -1,7 +1,14 @@
#pragma once #pragma once
#ifndef _MSC_VER #ifndef _MSC_VER
#if defined(__WINE__) && defined(__clang__)
#pragma push_macro("_WIN32")
#undef _WIN32
#endif
#include <x86intrin.h> #include <x86intrin.h>
#if defined(__WINE__) && defined(__clang__)
#pragma pop_macro("_WIN32")
#endif
#else #else
#include <intrin.h> #include <intrin.h>
#endif #endif
@ -73,4 +80,4 @@ namespace dxvk::bit {
return shift > Bits ? shift - Bits : 0; return shift > Bits ? shift - Bits : 0;
} }
} }