Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 18:42:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WIDL] Properly pass architecture flag instead of modifying the code

Browse source 
This reverts commit 73c776c744 "[WIDL] Fix non-x86 builds".
This commit is contained in:
Timo Kreuzer 2024-12-15 10:23:50 +02:00
parent 1b14ce5db3
commit 995e4c829a
3 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -140,6 +140,10 @@ if(NOT CMAKE_CROSSCOMPILING)
add_definitions(/D_X86_ /D__i386__ /DWIN32 /D_WINDOWS) add_definitions(/D_X86_ /D__i386__ /DWIN32 /D_WINDOWS)
elseif(ARCH STREQUAL "amd64") elseif(ARCH STREQUAL "amd64")
add_definitions(-D_AMD64_ -D__x86_64__ /DWIN32 -D_WINDOWS) add_definitions(-D_AMD64_ -D__x86_64__ /DWIN32 -D_WINDOWS)
elseif(ARCH STREQUAL "arm")
add_definitions(-D__arm__)
elseif(ARCH STREQUAL "arm64")
add_definitions(-D__aarch64__)
endif() endif()
if(MSVC_VERSION GREATER 1699) if(MSVC_VERSION GREATER 1699)
add_definitions(/D_ALLOW_KEYWORD_MACROS) add_definitions(/D_ALLOW_KEYWORD_MACROS)

6
sdk/cmake/widl-support.cmake
View file

@ -1,11 +1,11 @@
#idl files support #idl files support
if(ARCH STREQUAL "i386") if(ARCH STREQUAL "i386")
set(IDL_FLAGS -m32 --win32) set(IDL_FLAGS -m32 --win32 -b i386-x-y)
elseif(ARCH STREQUAL "amd64") elseif(ARCH STREQUAL "amd64")
set(IDL_FLAGS -m64 --win64) set(IDL_FLAGS -m64 --win64 -b amd64-x-y)
else() else()
set(IDL_FLAGS "") set(IDL_FLAGS -b ${ARCH}-x-y)
endif() endif()
function(add_typelib) function(add_typelib)

11
sdk/tools/widl/widl.c
View file

@ -92,16 +92,15 @@ static const char usage[] =
static const char version_string[] = "Wine IDL Compiler version " PACKAGE_VERSION "\n" static const char version_string[] = "Wine IDL Compiler version " PACKAGE_VERSION "\n"
"Copyright 2002 Ove Kaaven\n"; "Copyright 2002 Ove Kaaven\n";
// __REACTOS__!! We must use TARGET_ macros here! #ifdef __i386__
#ifdef TARGET_i386
enum target_cpu target_cpu = CPU_x86; enum target_cpu target_cpu = CPU_x86;
#elif defined(TARGET_amd64) #elif defined(__x86_64__)
enum target_cpu target_cpu = CPU_x86_64; enum target_cpu target_cpu = CPU_x86_64;
#elif defined(TARGET_ppc) #elif defined(__powerpc__)
enum target_cpu target_cpu = CPU_POWERPC; enum target_cpu target_cpu = CPU_POWERPC;
#elif defined(TARGET_arm) #elif defined(__arm__)
enum target_cpu target_cpu = CPU_ARM; enum target_cpu target_cpu = CPU_ARM;
#elif defined(TARGET_arm64) #elif defined(__aarch64__)
enum target_cpu target_cpu = CPU_ARM64; enum target_cpu target_cpu = CPU_ARM64;
#else #else
#error Unsupported CPU #error Unsupported CPU