Fix cmake build

George8327 · May 13, 2019 · 3a37806 · 3a37806
1 parent c72560b
commit 3a37806
Show file tree

Hide file tree

Showing 52 changed files with 58 additions and 53 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -46,10 +46,11 @@ macro(widl_build file_idl file_c file_h)
     get_filename_component(name_we ${file_idl} NAME_WE)
     add_custom_command(OUTPUT ${file_c} ${file_h}
     DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${file_idl} widl
-    COMMAND $<TARGET_FILE_DIR:widl>/widl ${CMAKE_CURRENT_SOURCE_DIR}/${file_idl} -o ${file_c} && $<TARGET_FILE_DIR:widl>/widl ${CMAKE_CURRENT_SOURCE_DIR}/${file_idl} -o ${file_h}
+    COMMAND $<TARGET_FILE_DIR:widl>/widl.exe ${CMAKE_CURRENT_SOURCE_DIR}/${file_idl} -o ${file_c} && $<TARGET_FILE_DIR:widl>/widl.exe ${CMAKE_CURRENT_SOURCE_DIR}/${file_idl} -o ${file_h}
 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
     add_custom_target(generate_ifs_${name_we} DEPENDS ${file_c} ${file_h})
 endmacro()
+include_directories(BEFORE wow32)
 find_package(BISON)
 find_package(FLEX)
 

diff --git a/avifile/CMakeLists.txt b/avifile/CMakeLists.txt
@@ -3,5 +3,5 @@ add_library(avifile SHARED ${SOURCE} ${CMAKE_SOURCE_DIR}/dummy.c ${CMAKE_CURRENT
 include_directories(../wine)
 add_definitions(-D_X86_ -D__WINESRC__ -D__i386__ -DHAVE_STRNCASECMP -DHAVE__STRNICMP -D_WINTERNL_ -DNtCurrentTeb=NtCurrentTeb__ -DDECLSPEC_HIDDEN= -Dstrncasecmp=_strnicmp)
 spec_build(avifile.dll16 avifile)
-target_link_libraries(avifile libwine winecrt0 wow32 krnl386 avifil32.lib)
+target_link_libraries(avifile libwine winecrt0 krnl386 avifil32.lib)
 set_target_properties(avifile PROPERTIES SUFFIX ".dll16")
diff --git a/comm/CMakeLists.txt b/comm/CMakeLists.txt
@@ -3,5 +3,5 @@ add_library(comm SHARED ${SOURCE} ${PROJECT_SOURCE_DIR}/dummy.c ${CMAKE_CURRENT_
 include_directories(../wine)
 add_definitions(-D_X86_ -D__WINESRC__ -D__i386__ -DHAVE_STRNCASECMP -DHAVE__STRNICMP -D_WINTERNL_ -DNtCurrentTeb=NtCurrentTeb__ -DDECLSPEC_HIDDEN= -Dstrncasecmp=_strnicmp)
 spec_build(comm.drv16 comm)
-target_link_libraries(comm libwine winecrt0 wow32 krnl386)
+target_link_libraries(comm libwine winecrt0 krnl386)
 set_target_properties(comm PROPERTIES SUFFIX ".drv16")
diff --git a/commctrl/CMakeLists.txt b/commctrl/CMakeLists.txt
@@ -3,5 +3,5 @@ add_library(commctrl SHARED ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/commctrl.def c
 include_directories(../wine)
 add_definitions(-D_X86_ -D__WINESRC__ -D__i386__ -DHAVE_STRNCASECMP -DHAVE__STRNICMP -D_WINTERNL_ -DNtCurrentTeb=NtCurrentTeb__ -DDECLSPEC_HIDDEN= -Dstrncasecmp=_strnicmp)
 spec_build(commctrl.dll16 commctrl)
-target_link_libraries(commctrl libwine winecrt0 wow32 krnl386 user comctl32.lib)
+target_link_libraries(commctrl libwine winecrt0 krnl386 user comctl32.lib)
 set_target_properties(commctrl PROPERTIES SUFFIX ".dll16")
diff --git a/commdlg/CMakeLists.txt b/commdlg/CMakeLists.txt
@@ -3,5 +3,5 @@ add_library(commdlg SHARED ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/commdlg.def com
 include_directories(../wine)
 add_definitions(-D_X86_ -D__WINESRC__ -D__i386__ -DHAVE_STRNCASECMP -DHAVE__STRNICMP -D_WINTERNL_ -DNtCurrentTeb=NtCurrentTeb__ -DDECLSPEC_HIDDEN= -Dstrncasecmp=_strnicmp)
 spec_build(commdlg.dll16 commdlg)
-target_link_libraries(commdlg libwine winecrt0 wow32 krnl386 user comdlg32.lib)
+target_link_libraries(commdlg libwine winecrt0 krnl386 user comdlg32.lib)
 set_target_properties(commdlg PROPERTIES SUFFIX ".dll16")
diff --git a/compobj/CMakeLists.txt b/compobj/CMakeLists.txt
@@ -3,5 +3,5 @@ add_library(compobj SHARED ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/compobj.def com
 include_directories(../wine)
 add_definitions(-D_X86_ -D__WINESRC__ -D__i386__ -DHAVE_STRNCASECMP -DHAVE__STRNICMP -D_WINTERNL_ -DNtCurrentTeb=NtCurrentTeb__ -DDECLSPEC_HIDDEN= -Dstrncasecmp=_strnicmp)
 spec_build(compobj.dll16 compobj)
-target_link_libraries(compobj libwine winecrt0 wow32 krnl386 ole2 ole32.lib)
+target_link_libraries(compobj libwine winecrt0 krnl386 ole2 ole32.lib)
 set_target_properties(compobj PROPERTIES SUFFIX ".dll16")
diff --git a/ctl3d/CMakeLists.txt b/ctl3d/CMakeLists.txt
@@ -3,5 +3,5 @@ add_library(ctl3d SHARED ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/ctl3d.def ctl3d.d
 include_directories(../wine)
 add_definitions(-D_X86_ -D__WINESRC__ -D__i386__ -DHAVE_STRNCASECMP -DHAVE__STRNICMP -D_WINTERNL_ -DNtCurrentTeb=NtCurrentTeb__ -DDECLSPEC_HIDDEN= -Dstrncasecmp=_strnicmp)
 spec_build(ctl3d.dll16 ctl3d)
-target_link_libraries(ctl3d libwine winecrt0 wow32 krnl386 ctl3dv2)
+target_link_libraries(ctl3d libwine winecrt0 krnl386 ctl3dv2)
 set_target_properties(ctl3d PROPERTIES SUFFIX ".dll16")
diff --git a/ctl3dv2/CMakeLists.txt b/ctl3dv2/CMakeLists.txt
@@ -3,5 +3,5 @@ add_library(ctl3dv2 SHARED ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/ctl3dv2.def ctl
 include_directories(../wine)
 add_definitions(-D_X86_ -D__WINESRC__ -D__i386__ -DHAVE_STRNCASECMP -DHAVE__STRNICMP -D_WINTERNL_ -DNtCurrentTeb=NtCurrentTeb__ -DDECLSPEC_HIDDEN= -Dstrncasecmp=_strnicmp)
 spec_build(ctl3dv2.dll16 ctl3dv2)
-target_link_libraries(ctl3dv2 libwine winecrt0 wow32 krnl386 user)
+target_link_libraries(ctl3dv2 libwine winecrt0 krnl386 user)
 set_target_properties(ctl3dv2 PROPERTIES SUFFIX ".dll16")
diff --git a/ddeml/CMakeLists.txt b/ddeml/CMakeLists.txt
@@ -3,5 +3,5 @@ add_library(ddeml SHARED ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/ddeml.def ddeml.d
 include_directories(../wine)
 add_definitions(-D_X86_ -D__WINESRC__ -D__i386__ -DHAVE_STRNCASECMP -DHAVE__STRNICMP -D_WINTERNL_ -DNtCurrentTeb=NtCurrentTeb__ -DDECLSPEC_HIDDEN= -Dstrncasecmp=_strnicmp)
 spec_build(ddeml.dll16 ddeml)
-target_link_libraries(ddeml libwine winecrt0 wow32 krnl386)
+target_link_libraries(ddeml libwine winecrt0 krnl386)
 set_target_properties(ddeml PROPERTIES SUFFIX ".dll16")
diff --git a/dispdib/CMakeLists.txt b/dispdib/CMakeLists.txt
@@ -3,5 +3,5 @@ add_library(dispdib SHARED ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/dispdib.def dis
 include_directories(../wine)
 add_definitions(-D_X86_ -D__WINESRC__ -D__i386__ -DHAVE_STRNCASECMP -DHAVE__STRNICMP -D_WINTERNL_ -DNtCurrentTeb=NtCurrentTeb__ -DDECLSPEC_HIDDEN= -Dstrncasecmp=_strnicmp)
 spec_build(dispdib.dll16 dispdib)
-target_link_libraries(dispdib libwine winecrt0 wow32 krnl386)
+target_link_libraries(dispdib libwine winecrt0 krnl386)
 set_target_properties(dispdib PROPERTIES SUFFIX ".dll16")
diff --git a/display/CMakeLists.txt b/display/CMakeLists.txt
@@ -3,5 +3,5 @@ add_library(display SHARED ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/display.def dis
 include_directories(../wine)
 add_definitions(-D_X86_ -D__WINESRC__ -D__i386__ -DHAVE_STRNCASECMP -DHAVE__STRNICMP -D_WINTERNL_ -DNtCurrentTeb=NtCurrentTeb__ -DDECLSPEC_HIDDEN= -Dstrncasecmp=_strnicmp)
 spec_build(display.drv16 display)
-target_link_libraries(display libwine winecrt0 wow32 krnl386)
+target_link_libraries(display libwine winecrt0 krnl386)
 set_target_properties(display PROPERTIES SUFFIX ".drv16")
diff --git a/gdi/CMakeLists.txt b/gdi/CMakeLists.txt
@@ -3,5 +3,5 @@ add_library(gdi SHARED ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/gdi.def gdi.exe16.o
 include_directories(../wine)
 add_definitions(-D_X86_ -D__WINESRC__ -D__i386__ -DHAVE_STRNCASECMP -DHAVE__STRNICMP -D_WINTERNL_ -DNtCurrentTeb=NtCurrentTeb__ -DDECLSPEC_HIDDEN= -Dstrncasecmp=_strnicmp)
 spec_build(gdi.exe16 GDI)
-target_link_libraries(gdi libwine winecrt0 wow32 krnl386 user)
+target_link_libraries(gdi libwine winecrt0 krnl386 user)
 set_target_properties(gdi PROPERTIES SUFFIX ".exe16")
diff --git a/keyboard/CMakeLists.txt b/keyboard/CMakeLists.txt
@@ -3,5 +3,5 @@ add_library(keyboard SHARED ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/keyboard.def k
 include_directories(../wine)
 add_definitions(-D_X86_ -D__WINESRC__ -D__i386__ -DHAVE_STRNCASECMP -DHAVE__STRNICMP -D_WINTERNL_ -DNtCurrentTeb=NtCurrentTeb__ -DDECLSPEC_HIDDEN= -Dstrncasecmp=_strnicmp)
 spec_build(keyboard.drv16 keyboard)
-target_link_libraries(keyboard libwine winecrt0 wow32 krnl386)
+target_link_libraries(keyboard libwine winecrt0 krnl386)
 set_target_properties(keyboard PROPERTIES SUFFIX ".drv16")
diff --git a/krnl386/CMakeLists.txt b/krnl386/CMakeLists.txt
@@ -3,5 +3,5 @@ add_library(krnl386 SHARED ${SOURCE} krnl386.exe16.obj ${CMAKE_CURRENT_BINARY_DI
 include_directories(../wine)
 add_definitions(-DMZ_SUPPORTED -DENABLEREDIRECTSYSTEMDIR -D_X86_ -D__WINESRC__ -D__i386__  -DHAVE_STRNCASECMP -DHAVE__STRNICMP -D_WINTERNL_ -DNtCurrentTeb=NtCurrentTeb__  -DDECLSPEC_HIDDEN= -Dstrncasecmp=_strnicmp)
 spec_build(krnl386.exe16 KERNEL)
-target_link_libraries(krnl386 libwine winecrt0 lz32.lib ntdll.lib ddraw.lib dsound.lib wow32)
+target_link_libraries(krnl386 libwine winecrt0 lz32.lib ntdll.lib ddraw.lib dsound.lib)
 set_target_properties(krnl386 PROPERTIES SUFFIX ".exe16")
diff --git a/krnl386/krnl386.exe16.spec b/krnl386/krnl386.exe16.spec
@@ -787,3 +787,4 @@
 @ stdcall -arch=win32 TaskSetCSIP16(long long long)
 @ stdcall -arch=win32 TaskGetCSIP16(long)
 @ stdcall -arch=win32 TaskSwitch16(long long)
+@ stdcall -arch=win32 AllocDStoCSAlias16(long)
diff --git a/lzexpand/CMakeLists.txt b/lzexpand/CMakeLists.txt
@@ -3,5 +3,5 @@ add_library(lzexpand SHARED ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/lzexpand.def l
 include_directories(../wine)
 add_definitions(-D_X86_ -D__WINESRC__ -D__i386__ -DHAVE_STRNCASECMP -DHAVE__STRNICMP -D_WINTERNL_ -DNtCurrentTeb=NtCurrentTeb__ -DDECLSPEC_HIDDEN= -Dstrncasecmp=_strnicmp)
 spec_build(lzexpand.dll16 lzexpand)
-target_link_libraries(lzexpand libwine winecrt0 wow32 krnl386)
+target_link_libraries(lzexpand libwine winecrt0 krnl386)
 set_target_properties(lzexpand PROPERTIES SUFFIX ".dll16")
diff --git a/mmsystem/CMakeLists.txt b/mmsystem/CMakeLists.txt
@@ -3,5 +3,5 @@ add_library(mmsystem SHARED ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/mmsystem.def m
 include_directories(../wine)
 add_definitions(-D_X86_ -D__WINESRC__ -D__i386__ -DHAVE_STRNCASECMP -DHAVE__STRNICMP -D_WINTERNL_ -DNtCurrentTeb=NtCurrentTeb__ -DDECLSPEC_HIDDEN= -Dstrncasecmp=_strnicmp)
 spec_build(mmsystem.dll16 mmsystem)
-target_link_libraries(mmsystem libwine winecrt0 wow32 krnl386 winmm.lib)
+target_link_libraries(mmsystem libwine winecrt0 krnl386 winmm.lib)
 set_target_properties(mmsystem PROPERTIES SUFFIX ".dll16")
diff --git a/mouse/CMakeLists.txt b/mouse/CMakeLists.txt
@@ -3,5 +3,5 @@ add_library(mouse SHARED ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/mouse.def mouse.d
 include_directories(../wine)
 add_definitions(-D_X86_ -D__WINESRC__ -D__i386__ -DHAVE_STRNCASECMP -DHAVE__STRNICMP -D_WINTERNL_ -DNtCurrentTeb=NtCurrentTeb__ -DDECLSPEC_HIDDEN= -Dstrncasecmp=_strnicmp)
 spec_build(mouse.drv16 mouse)
-target_link_libraries(mouse libwine winecrt0 wow32 krnl386)
+target_link_libraries(mouse libwine winecrt0 krnl386)
 set_target_properties(mouse PROPERTIES SUFFIX ".drv16")
diff --git a/msacm/CMakeLists.txt b/msacm/CMakeLists.txt
@@ -3,5 +3,5 @@ add_library(msacm SHARED ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/msacm.def msacm.d
 include_directories(../wine)
 add_definitions(-D_X86_ -D__WINESRC__ -D__i386__ -DHAVE_STRNCASECMP -DHAVE__STRNICMP -D_WINTERNL_ -DNtCurrentTeb=NtCurrentTeb__ -DDECLSPEC_HIDDEN= -Dstrncasecmp=_strnicmp)
 spec_build(msacm.dll16 msacm)
-target_link_libraries(msacm libwine winecrt0 wow32 krnl386 msacm32.lib)
+target_link_libraries(msacm libwine winecrt0 krnl386 msacm32.lib)
 set_target_properties(msacm PROPERTIES SUFFIX ".dll16")
diff --git a/msvideo/CMakeLists.txt b/msvideo/CMakeLists.txt
@@ -3,5 +3,5 @@ add_library(msvideo SHARED ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/msvideo.def msv
 include_directories(../wine)
 add_definitions(-D_X86_ -D__WINESRC__ -D__i386__ -DHAVE_STRNCASECMP -DHAVE__STRNICMP -D_WINTERNL_ -DNtCurrentTeb=NtCurrentTeb__ -DDECLSPEC_HIDDEN= -Dstrncasecmp=_strnicmp)
 spec_build(msvideo.dll16 msvideo)
-target_link_libraries(msvideo libwine winecrt0 wow32 krnl386 msvfw32.lib version.lib)
+target_link_libraries(msvideo libwine winecrt0 krnl386 msvfw32.lib version.lib)
 set_target_properties(msvideo PROPERTIES SUFFIX ".dll16")
diff --git a/nddeapi/CMakeLists.txt b/nddeapi/CMakeLists.txt
@@ -3,5 +3,5 @@ add_library(nddeapi SHARED ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/nddeapi.def ndd
 include_directories(../wine)
 add_definitions(-D_X86_ -D__WINESRC__ -D__i386__ -DHAVE_STRNCASECMP -DHAVE__STRNICMP -D_WINTERNL_ -DNtCurrentTeb=NtCurrentTeb__ -DDECLSPEC_HIDDEN= -Dstrncasecmp=_strnicmp)
 spec_build(nddeapi.dll16 nddeapi)
-target_link_libraries(nddeapi libwine winecrt0 wow32 krnl386)
+target_link_libraries(nddeapi libwine winecrt0 krnl386)
 set_target_properties(nddeapi PROPERTIES SUFFIX ".dll16")
diff --git a/ole2/CMakeLists.txt b/ole2/CMakeLists.txt
@@ -1,8 +1,8 @@
 file(GLOB SOURCE *.c *.cpp *.rc)
-add_library(ole2 SHARED ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/ole2.def ole2.dll16.obj ifs_16.c)
+add_library(ole2 SHARED ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/ole2.def ole2.dll16.obj ./ifs_16.c)
 include_directories(../wine)
 add_definitions(-D_X86_ -D__WINESRC__ -D__i386__ -DHAVE_STRNCASECMP -DHAVE__STRNICMP -D_WINTERNL_ -DNtCurrentTeb=NtCurrentTeb__ -DDECLSPEC_HIDDEN= -Dstrncasecmp=_strnicmp)
 widl_build(ifs.idl ifs_16.c ifs_16.h)
 spec_build(ole2.dll16 ole2)
-target_link_libraries(ole2 libwine winecrt0 wow32 krnl386 ole32.lib user)
+target_link_libraries(ole2 libwine winecrt0 krnl386 ole32.lib user)
 set_target_properties(ole2 PROPERTIES SUFFIX ".dll16")
diff --git a/ole2conv/CMakeLists.txt b/ole2conv/CMakeLists.txt
@@ -3,5 +3,5 @@ add_library(ole2conv SHARED ${SOURCE} ${CMAKE_SOURCE_DIR}/dummy.c ${CMAKE_CURREN
 include_directories(../wine)
 add_definitions(-D_X86_ -D__WINESRC__ -D__i386__ -DHAVE_STRNCASECMP -DHAVE__STRNICMP -D_WINTERNL_ -DNtCurrentTeb=NtCurrentTeb__ -DDECLSPEC_HIDDEN= -Dstrncasecmp=_strnicmp)
 spec_build(ole2conv.dll16 ole2conv)
-target_link_libraries(ole2conv libwine winecrt0 wow32 krnl386)
+target_link_libraries(ole2conv libwine winecrt0 krnl386)
 set_target_properties(ole2conv PROPERTIES SUFFIX ".dll16")
diff --git a/ole2disp/CMakeLists.txt b/ole2disp/CMakeLists.txt
@@ -3,5 +3,5 @@ add_library(ole2disp SHARED ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/ole2disp.def o
 include_directories(../wine)
 add_definitions(-DARRAY_SIZE=ARRAYSIZE -D_X86_ -D__WINESRC__ -D__i386__ -DHAVE_STRNCASECMP -DHAVE__STRNICMP -D_WINTERNL_ -DNtCurrentTeb=NtCurrentTeb__ -DDECLSPEC_HIDDEN= -Dstrncasecmp=_strnicmp)
 spec_build(ole2disp.dll16 ole2disp)
-target_link_libraries(ole2disp libwine winecrt0 wow32 krnl386 ole2 compobj)
+target_link_libraries(ole2disp libwine winecrt0 krnl386 ole2 compobj)
 set_target_properties(ole2disp PROPERTIES SUFFIX ".dll16")
diff --git a/ole2nls/CMakeLists.txt b/ole2nls/CMakeLists.txt
@@ -3,5 +3,5 @@ add_library(ole2nls SHARED ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/ole2nls.def ole
 include_directories(../wine)
 add_definitions(-D_X86_ -D__WINESRC__ -D__i386__ -DHAVE_STRNCASECMP -DHAVE__STRNICMP -D_WINTERNL_ -DNtCurrentTeb=NtCurrentTeb__ -DDECLSPEC_HIDDEN= -Dstrncasecmp=_strnicmp)
 spec_build(ole2nls.dll16 ole2nls)
-target_link_libraries(ole2nls libwine winecrt0 wow32 krnl386)
+target_link_libraries(ole2nls libwine winecrt0 krnl386)
 set_target_properties(ole2nls PROPERTIES SUFFIX ".dll16")
diff --git a/ole2prox/CMakeLists.txt b/ole2prox/CMakeLists.txt
@@ -3,5 +3,5 @@ add_library(ole2prox SHARED ${SOURCE} ${CMAKE_SOURCE_DIR}/dummy.c ${CMAKE_CURREN
 include_directories(../wine)
 add_definitions(-D_X86_ -D__WINESRC__ -D__i386__ -DHAVE_STRNCASECMP -DHAVE__STRNICMP -D_WINTERNL_ -DNtCurrentTeb=NtCurrentTeb__ -DDECLSPEC_HIDDEN= -Dstrncasecmp=_strnicmp)
 spec_build(ole2prox.dll16 ole2prox)
-target_link_libraries(ole2prox libwine winecrt0 wow32 krnl386)
+target_link_libraries(ole2prox libwine winecrt0 krnl386)
 set_target_properties(ole2prox PROPERTIES SUFFIX ".dll16")
diff --git a/ole2thk/CMakeLists.txt b/ole2thk/CMakeLists.txt
@@ -3,5 +3,5 @@ add_library(ole2thk SHARED ${SOURCE} ${CMAKE_SOURCE_DIR}/dummy.c ${CMAKE_CURRENT
 include_directories(../wine)
 add_definitions(-D_X86_ -D__WINESRC__ -D__i386__ -DHAVE_STRNCASECMP -DHAVE__STRNICMP -D_WINTERNL_ -DNtCurrentTeb=NtCurrentTeb__ -DDECLSPEC_HIDDEN= -Dstrncasecmp=_strnicmp)
 spec_build(ole2thk.dll16 ole2thk)
-target_link_libraries(ole2thk libwine winecrt0 wow32 krnl386)
+target_link_libraries(ole2thk libwine winecrt0 krnl386)
 set_target_properties(ole2thk PROPERTIES SUFFIX ".dll16")
diff --git a/olecli/CMakeLists.txt b/olecli/CMakeLists.txt
@@ -3,5 +3,5 @@ add_library(olecli SHARED ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/olecli.def olecl
 include_directories(../wine)
 add_definitions(-D_X86_ -D__WINESRC__ -D__i386__ -DHAVE_STRNCASECMP -DHAVE__STRNICMP -D_WINTERNL_ -DNtCurrentTeb=NtCurrentTeb__ -DDECLSPEC_HIDDEN= -Dstrncasecmp=_strnicmp)
 spec_build(olecli.dll16 olecli)
-target_link_libraries(olecli libwine winecrt0 wow32 krnl386 olecli32.lib)
+target_link_libraries(olecli libwine winecrt0 krnl386 olecli32.lib)
 set_target_properties(olecli PROPERTIES SUFFIX ".dll16")
diff --git a/olesvr/CMakeLists.txt b/olesvr/CMakeLists.txt
@@ -3,5 +3,5 @@ add_library(olesvr SHARED ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/olesvr.def olesv
 include_directories(../wine)
 add_definitions(-D_X86_ -D__WINESRC__ -D__i386__ -DHAVE_STRNCASECMP -DHAVE__STRNICMP -D_WINTERNL_ -DNtCurrentTeb=NtCurrentTeb__ -DDECLSPEC_HIDDEN= -Dstrncasecmp=_strnicmp)
 spec_build(olesvr.dll16 olesvr)
-target_link_libraries(olesvr libwine winecrt0 wow32 krnl386 olesvr32.lib)
+target_link_libraries(olesvr libwine winecrt0 krnl386 olesvr32.lib)
 set_target_properties(olesvr PROPERTIES SUFFIX ".dll16")
diff --git a/rmpatch/CMakeLists.txt b/rmpatch/CMakeLists.txt
@@ -3,5 +3,5 @@ add_library(rmpatch SHARED ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/rmpatch.def rmp
 include_directories(../wine)
 add_definitions(-D_X86_ -D__WINESRC__ -D__i386__ -DHAVE_STRNCASECMP -DHAVE__STRNICMP -D_WINTERNL_ -DNtCurrentTeb=NtCurrentTeb__ -DDECLSPEC_HIDDEN= -Dstrncasecmp=_strnicmp)
 spec_build(rmpatch.dll16 rmpatch)
-target_link_libraries(rmpatch libwine winecrt0 wow32 krnl386 toolhelp rmpatch32.lib)
+target_link_libraries(rmpatch libwine winecrt0 krnl386 toolhelp)
 set_target_properties(rmpatch PROPERTIES SUFFIX ".dll16")
diff --git a/rmpatch/instr.c b/rmpatch/instr.c
@@ -39,7 +39,7 @@ static inline void add_stack(CONTEXT *context, int offset)
     ADD_LOWORD(context->Esp, offset);
 }
 
-static inline void *make_ptr(CONTEXT *context, DWORD seg, DWORD off)
+static inline void *make_ptr(CONTEXT *context, DWORD seg, DWORD off, int long_addr)
 {
     return (char *) MapSL(MAKESEGPTR(seg, off));
 }

diff --git a/rmpatch/rmpatch.dll16.spec b/rmpatch/rmpatch.dll16.spec
@@ -1,2 +1,3 @@
 1 pascal DllEntryPoint(long word word word long word) DllEntryPoint
 2 pascal -register intcb() intcb
+@ stdcall -arch=win32 checkpatch(ptr long ptr)
diff --git a/shell/CMakeLists.txt b/shell/CMakeLists.txt
@@ -3,5 +3,5 @@ add_library(shell SHARED ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/shell.def shell.d
 include_directories(../wine)
 add_definitions(-D_X86_ -D__WINESRC__ -D__i386__ -DHAVE_STRNCASECMP -DHAVE__STRNICMP -D_WINTERNL_ -DNtCurrentTeb=NtCurrentTeb__ -DDECLSPEC_HIDDEN= -Dstrncasecmp=_strnicmp)
 spec_build(shell.dll16 shell)
-target_link_libraries(shell libwine winecrt0 wow32 krnl386 shell32.lib)
+target_link_libraries(shell libwine winecrt0 krnl386 shell32.lib)
 set_target_properties(shell PROPERTIES SUFFIX ".dll16")
diff --git a/sound/CMakeLists.txt b/sound/CMakeLists.txt
@@ -3,5 +3,5 @@ add_library(sound SHARED ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/sound.def sound.d
 include_directories(../wine)
 add_definitions(-D_X86_ -D__WINESRC__ -D__i386__ -DHAVE_STRNCASECMP -DHAVE__STRNICMP -D_WINTERNL_ -DNtCurrentTeb=NtCurrentTeb__ -DDECLSPEC_HIDDEN= -Dstrncasecmp=_strnicmp)
 spec_build(sound.drv16 sound)
-target_link_libraries(sound libwine winecrt0 wow32 krnl386 winmm.lib)
+target_link_libraries(sound libwine winecrt0 krnl386 winmm.lib)
 set_target_properties(sound PROPERTIES SUFFIX ".drv16")
diff --git a/storage/CMakeLists.txt b/storage/CMakeLists.txt
@@ -3,5 +3,5 @@ add_library(storage SHARED ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/storage.def sto
 include_directories(../wine)
 add_definitions(-D_X86_ -D__WINESRC__ -D__i386__ -DHAVE_STRNCASECMP -DHAVE__STRNICMP -D_WINTERNL_ -DNtCurrentTeb=NtCurrentTeb__ -DDECLSPEC_HIDDEN= -Dstrncasecmp=_strnicmp)
 spec_build(storage.dll16 storage)
-target_link_libraries(storage libwine winecrt0 wow32 krnl386 ole2)
+target_link_libraries(storage libwine winecrt0 krnl386 ole2)
 set_target_properties(storage PROPERTIES SUFFIX ".dll16")
diff --git a/system/CMakeLists.txt b/system/CMakeLists.txt
@@ -3,5 +3,5 @@ add_library(system SHARED ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/system.def syste
 include_directories(../wine)
 add_definitions(-D_X86_ -D__WINESRC__ -D__i386__ -DHAVE_STRNCASECMP -DHAVE__STRNICMP -D_WINTERNL_ -DNtCurrentTeb=NtCurrentTeb__ -DDECLSPEC_HIDDEN= -Dstrncasecmp=_strnicmp)
 spec_build(system.drv16 system)
-target_link_libraries(system libwine winecrt0 wow32 krnl386)
+target_link_libraries(system libwine winecrt0 krnl386)
 set_target_properties(system PROPERTIES SUFFIX ".drv16")
diff --git a/timer/CMakeLists.txt b/timer/CMakeLists.txt
@@ -3,5 +3,5 @@ add_library(timer SHARED ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/timer.def timer.d
 include_directories(../wine)
 add_definitions(-D_X86_ -D__WINESRC__ -D__i386__ -DHAVE_STRNCASECMP -DHAVE__STRNICMP -D_WINTERNL_ -DNtCurrentTeb=NtCurrentTeb__ -DDECLSPEC_HIDDEN= -Dstrncasecmp=_strnicmp)
 spec_build(timer.drv16 timer)
-target_link_libraries(timer libwine winecrt0 wow32 krnl386)
+target_link_libraries(timer libwine winecrt0 krnl386)
 set_target_properties(timer PROPERTIES SUFFIX ".drv16")
diff --git a/toolhelp/CMakeLists.txt b/toolhelp/CMakeLists.txt
@@ -3,5 +3,5 @@ add_library(toolhelp SHARED ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/toolhelp.def t
 include_directories(../wine)
 add_definitions(-D_X86_ -D__WINESRC__ -D__i386__ -DHAVE_STRNCASECMP -DHAVE__STRNICMP -D_WINTERNL_ -DNtCurrentTeb=NtCurrentTeb__ -DDECLSPEC_HIDDEN= -Dstrncasecmp=_strnicmp)
 spec_build(toolhelp.dll16 toolhelp)
-target_link_libraries(toolhelp libwine winecrt0 wow32 krnl386 user)
+target_link_libraries(toolhelp libwine winecrt0 krnl386 user)
 set_target_properties(toolhelp PROPERTIES SUFFIX ".dll16")
diff --git a/typelib/CMakeLists.txt b/typelib/CMakeLists.txt
@@ -3,5 +3,5 @@ add_library(typelib SHARED ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/typelib.def typ
 include_directories(../wine)
 add_definitions(-D_X86_ -D__WINESRC__ -D__i386__ -DHAVE_STRNCASECMP -DHAVE__STRNICMP -D_WINTERNL_ -DNtCurrentTeb=NtCurrentTeb__ -DDECLSPEC_HIDDEN= -Dstrncasecmp=_strnicmp)
 spec_build(typelib.dll16 typelib)
-target_link_libraries(typelib libwine winecrt0 wow32 krnl386 ole2 ole2disp)
+target_link_libraries(typelib libwine winecrt0 krnl386 ole2 ole2disp)
 set_target_properties(typelib PROPERTIES SUFFIX ".dll16")