Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-20 17:45:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CMAKE] Add some -D__ROS_LONG64__ to please gcc x64

Browse source 
We can now pass a UINT* to a function wanting a DWORD*
This commit is contained in:
Hervé Poussineau 2020-03-26 14:40:39 +01:00
parent 7cda1ed2f5
commit 5ed1867632
22 changed files with 22 additions and 8 deletions

1
dll/directx/wine/d3d8/CMakeLists.txt
View file

@ -1,6 +1,7 @@
add_definitions( add_definitions(
-D__WINESRC__ -D__WINESRC__
-D__ROS_LONG64__
-DUSE_WIN32_OPENGL) -DUSE_WIN32_OPENGL)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)

1
dll/directx/wine/d3dcompiler_43/CMakeLists.txt
View file

@ -1,6 +1,7 @@
add_definitions( add_definitions(
-D__WINESRC__ -D__WINESRC__
-D__ROS_LONG64__
-DDIRECT3D_VERSION=0x0900) -DDIRECT3D_VERSION=0x0900)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)

1
dll/directx/wine/d3dx9_36/d3dx9.cmake
View file

@ -32,6 +32,7 @@ function(add_d3dx9_target __version)
${CMAKE_CURRENT_BINARY_DIR}/${module}_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/${module}_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/${module}.def) ${CMAKE_CURRENT_BINARY_DIR}/${module}.def)
add_definitions(-D__ROS_LONG64__)
set_module_type(${module} win32dll) set_module_type(${module} win32dll)
add_dependencies(${module} d3d_idl_headers) add_dependencies(${module} d3d_idl_headers)
target_link_libraries(${module} dxguid wine) target_link_libraries(${module} dxguid wine)

1
dll/directx/wine/ddraw/CMakeLists.txt
View file

@ -1,6 +1,7 @@
add_definitions( add_definitions(
-D__WINESRC__ -D__WINESRC__
-D__ROS_LONG64__
-DUSE_WIN32_OPENGL) -DUSE_WIN32_OPENGL)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)

1
dll/directx/wine/wined3d/CMakeLists.txt
View file

@ -3,6 +3,7 @@ add_definitions(
-D__WINESRC__ -D__WINESRC__
-D_USE_MATH_DEFINES -D_USE_MATH_DEFINES
-DUSE_WIN32_OPENGL -DUSE_WIN32_OPENGL
-D__ROS_LONG64__
-Dcopysignf=_copysignf) -Dcopysignf=_copysignf)
include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)

1
dll/win32/comctl32/CMakeLists.txt
View file

@ -2,6 +2,7 @@
add_definitions( add_definitions(
-D__WINESRC__ -D__WINESRC__
-D_WINE -D_WINE
-D__ROS_LONG64__
-D_COMCTL32_) -D_COMCTL32_)
remove_definitions(-D_WIN32_WINNT=0x502 -DWINVER=0x502) remove_definitions(-D_WIN32_WINNT=0x502 -DWINVER=0x502)

1
dll/win32/crypt32/CMakeLists.txt
View file

@ -4,6 +4,7 @@ add_definitions(-D_WIN32_WINNT=0x600 -DWINVER=0x600)
add_definitions( add_definitions(
-D__WINESRC__ -D__WINESRC__
-D__ROS_LONG64__
-D_WINE -D_WINE
-D_CRYPT32_) -D_CRYPT32_)

1
dll/win32/gdiplus/CMakeLists.txt
View file

@ -1,6 +1,7 @@
add_definitions( add_definitions(
-D__WINESRC__ -D__WINESRC__
-D__ROS_LONG64__
-D_USE_MATH_DEFINES) -D_USE_MATH_DEFINES)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)

2
dll/win32/inetmib1/CMakeLists.txt
View file

@ -1,5 +1,5 @@
add_definitions(-D__WINESRC__) add_definitions(-D__WINESRC__ -D__ROS_LONG64__)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
spec2def(inetmib1.dll inetmib1.spec) spec2def(inetmib1.dll inetmib1.spec)

2
dll/win32/itss/CMakeLists.txt
View file

@ -1,5 +1,5 @@
add_definitions(-D__WINESRC__) add_definitions(-D__WINESRC__ -D__ROS_LONG64__)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
spec2def(itss.dll itss.spec) spec2def(itss.dll itss.spec)

1
dll/win32/jscript/CMakeLists.txt
View file

@ -1,6 +1,7 @@
add_definitions( add_definitions(
-D__WINESRC__ -D__WINESRC__
-D__ROS_LONG64__
-D_USE_MATH_DEFINES) -D_USE_MATH_DEFINES)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)

1
dll/win32/mshtml/CMakeLists.txt
View file

@ -4,6 +4,7 @@ add_definitions(-D_WIN32_WINNT=0x600)
add_definitions( add_definitions(
-D__WINESRC__ -D__WINESRC__
-D__ROS_LONG64__
-DCOM_NO_WINDOWS_H) -DCOM_NO_WINDOWS_H)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)

2
dll/win32/msi/CMakeLists.txt
View file

@ -3,7 +3,7 @@ remove_definitions(-D_WIN32_WINNT=0x502)
add_definitions(-D_WIN32_WINNT=0x600) add_definitions(-D_WIN32_WINNT=0x600)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
add_definitions(-D__WINESRC__ -DMSIRUNMODE=MSIRUNMODE_T) add_definitions(-D__WINESRC__ -D__ROS_LONG64__ -DMSIRUNMODE=MSIRUNMODE_T)
spec2def(msi.dll msi.spec ADD_IMPORTLIB) spec2def(msi.dll msi.spec ADD_IMPORTLIB)
generate_idl_iids(msiserver.idl) generate_idl_iids(msiserver.idl)

1
dll/win32/msxml3/CMakeLists.txt
View file

@ -1,6 +1,7 @@
add_definitions( add_definitions(
-D__WINESRC__ -D__WINESRC__
-D__ROS_LONG64__
-D_WINE -D_WINE
-DLIBXML_STATIC -DLIBXML_STATIC
-DCOM_NO_WINDOWS_H) -DCOM_NO_WINDOWS_H)

1
dll/win32/ole32/CMakeLists.txt
View file

@ -5,6 +5,7 @@ add_definitions(-D_WIN32_WINNT=0x600)
add_definitions( add_definitions(
-D__WINESRC__ -D__WINESRC__
-D_OLE32_ -D_OLE32_
-D__ROS_LONG64__
-DCOM_NO_WINDOWS_H -DCOM_NO_WINDOWS_H
-DENTRY_PREFIX=OLE32_ -DENTRY_PREFIX=OLE32_
-DPROXY_CLSID=CLSID_PSFactoryBuffer -DPROXY_CLSID=CLSID_PSFactoryBuffer

1
dll/win32/oleaut32/CMakeLists.txt
View file

@ -4,6 +4,7 @@ add_definitions(-D_WIN32_WINNT=0x600)
add_definitions( add_definitions(
-D__WINESRC__ -D__WINESRC__
-D__ROS_LONG64__
-DCOM_NO_WINDOWS_H -DCOM_NO_WINDOWS_H
-D_OLEAUT32_ -D_OLEAUT32_
-DPROXY_DELEGATION -DPROXY_DELEGATION

2
dll/win32/riched20/CMakeLists.txt
View file

@ -1,5 +1,5 @@
add_definitions(-D__WINESRC__) add_definitions(-D__WINESRC__ -D__ROS_LONG64__)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
spec2def(riched20.dll riched20.spec ADD_IMPORTLIB) spec2def(riched20.dll riched20.spec ADD_IMPORTLIB)

2
dll/win32/scrrun/CMakeLists.txt
View file

@ -1,6 +1,6 @@
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
add_definitions(-D__WINESRC__) add_definitions(-D__WINESRC__ -D__ROS_LONG64__)
spec2def(scrrun.dll scrrun.spec) spec2def(scrrun.dll scrrun.spec)
add_idl_headers(scrrun_idlheader scrrun.idl) add_idl_headers(scrrun_idlheader scrrun.idl)
add_typelib(scrrun.idl) add_typelib(scrrun.idl)

2
dll/win32/uxtheme/CMakeLists.txt
View file

@ -1,6 +1,6 @@
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
add_definitions(-D__WINESRC__) add_definitions(-D__WINESRC__ -D__ROS_LONG64__)
spec2def(uxtheme.dll uxtheme.spec ADD_IMPORTLIB) spec2def(uxtheme.dll uxtheme.spec ADD_IMPORTLIB)
list(APPEND SOURCE list(APPEND SOURCE

2
dll/win32/vbscript/CMakeLists.txt
View file

@ -1,5 +1,5 @@
add_definitions(-D__WINESRC__) add_definitions(-D__WINESRC__ -D__ROS_LONG64__)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
spec2def(vbscript.dll vbscript.spec) spec2def(vbscript.dll vbscript.spec)

2
dll/win32/wbemprox/CMakeLists.txt
View file

@ -2,7 +2,7 @@
remove_definitions(-D_WIN32_WINNT=0x502) remove_definitions(-D_WIN32_WINNT=0x502)
add_definitions(-D_WIN32_WINNT=0x600) add_definitions(-D_WIN32_WINNT=0x600)
add_definitions(-D__WINESRC__) add_definitions(-D__WINESRC__ -D__ROS_LONG64__)
include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
spec2def(wbemprox.dll wbemprox.spec) spec2def(wbemprox.dll wbemprox.spec)

1
dll/win32/windowscodecs/CMakeLists.txt
View file

@ -1,6 +1,7 @@
add_definitions( add_definitions(
-D__WINESRC__ -D__WINESRC__
-D__ROS_LONG64__
-DENTRY_PREFIX=WIC_ -DENTRY_PREFIX=WIC_
-DPROXY_DELEGATION -DPROXY_DELEGATION
-DWINE_REGISTER_DLL) -DWINE_REGISTER_DLL)