diff --git a/reactos/Makefile b/reactos/Makefile index 6dd05b57f5a..8095943b3b1 100644 --- a/reactos/Makefile +++ b/reactos/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.192 2003/12/07 16:46:31 mf Exp $ +# $Id: Makefile,v 1.193 2003/12/15 20:03:13 weiden Exp $ # # Global makefile # @@ -35,7 +35,7 @@ LIB_FSLIB = vfatlib LIB_STATIC = string rosrtl epsapi zlib # Keyboard layout libraries -DLLS_KBD = kbdus kbdgr kbdfr +DLLS_KBD = kbdus kbdgr kbdfr kbduk # User mode libraries # advapi32 cards crtdll fmifs gdi32 imagehlp kernel32 libpcap packet msafd msvcrt ntdll diff --git a/reactos/lib/kbdfr/kbdfr.c b/reactos/lib/kbdfr/kbdfr.c index 7f89aba248a..0e174e29cee 100644 --- a/reactos/lib/kbdfr/kbdfr.c +++ b/reactos/lib/kbdfr/kbdfr.c @@ -468,12 +468,3 @@ PKBDTABLES STDCALL KbdLayerDescriptor() { return &keyboard_layout_table; } -INT STDCALL -DllMain( - PVOID hinstDll, - ULONG dwReason, - PVOID reserved) -{ - return 1; -} - diff --git a/reactos/lib/kbdfr/makefile b/reactos/lib/kbdfr/makefile index dade1487073..2b65fce2988 100644 --- a/reactos/lib/kbdfr/makefile +++ b/reactos/lib/kbdfr/makefile @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.2 2003/11/07 18:55:50 arty Exp $ +# $Id: makefile,v 1.3 2003/12/15 20:03:13 weiden Exp $ PATH_TO_TOP = ../.. @@ -8,6 +8,8 @@ TARGET_NAME = kbdfr TARGET_BASE = 0x5500000 +TARGET_ENTRY = 0x00000000 + TARGET_CFLAGS = -I$(PATH_TO_TOP)/ntoskrnl/include # require os code to explicitly request A/W version of structs/functions diff --git a/reactos/lib/kbdgr/kbdgr.c b/reactos/lib/kbdgr/kbdgr.c index 2e00171b913..0aa28e2c2d1 100644 --- a/reactos/lib/kbdgr/kbdgr.c +++ b/reactos/lib/kbdgr/kbdgr.c @@ -496,12 +496,3 @@ PKBDTABLES STDCALL KbdLayerDescriptor() { return &keyboard_layout_table; } -INT STDCALL -DllMain( - PVOID hinstDll, - ULONG dwReason, - PVOID reserved) -{ - return 1; -} - diff --git a/reactos/lib/kbdgr/makefile b/reactos/lib/kbdgr/makefile index a7db8edd519..019c738c816 100644 --- a/reactos/lib/kbdgr/makefile +++ b/reactos/lib/kbdgr/makefile @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.1 2003/10/09 17:48:44 weiden Exp $ +# $Id: makefile,v 1.2 2003/12/15 20:03:13 weiden Exp $ PATH_TO_TOP = ../.. @@ -8,6 +8,8 @@ TARGET_NAME = kbdgr TARGET_BASE = 0x5500000 +TARGET_ENTRY = 0x00000000 + TARGET_CFLAGS = -I$(PATH_TO_TOP)/ntoskrnl/include # require os code to explicitly request A/W version of structs/functions diff --git a/reactos/lib/kbduk/kbduk.c b/reactos/lib/kbduk/kbduk.c index 47a9abab0a5..29bb8341fcf 100644 --- a/reactos/lib/kbduk/kbduk.c +++ b/reactos/lib/kbduk/kbduk.c @@ -417,12 +417,3 @@ PKBDTABLES STDCALL KbdLayerDescriptor() { return &keyboard_layout_table; } -INT STDCALL -DllMain( - PVOID hinstDll, - ULONG dwReason, - PVOID reserved) -{ - return 1; -} - diff --git a/reactos/lib/kbduk/makefile b/reactos/lib/kbduk/makefile index 5c7b6f245e5..a9aa8475977 100644 --- a/reactos/lib/kbduk/makefile +++ b/reactos/lib/kbduk/makefile @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.1 2003/11/06 17:18:25 fireball Exp $ +# $Id: makefile,v 1.2 2003/12/15 20:03:13 weiden Exp $ PATH_TO_TOP = ../.. @@ -8,6 +8,8 @@ TARGET_NAME = kbduk TARGET_BASE = 0x5500000 +TARGET_ENTRY = 0x00000000 + TARGET_CFLAGS = -I$(PATH_TO_TOP)/ntoskrnl/include # require os code to explicitly request A/W version of structs/functions diff --git a/reactos/lib/kbdus/kbdus.c b/reactos/lib/kbdus/kbdus.c index c4265793a5e..b648993af28 100644 --- a/reactos/lib/kbdus/kbdus.c +++ b/reactos/lib/kbdus/kbdus.c @@ -397,12 +397,3 @@ PKBDTABLES STDCALL KbdLayerDescriptor() { return &keyboard_layout_table; } -INT STDCALL -DllMain( - PVOID hinstDll, - ULONG dwReason, - PVOID reserved) -{ - return 1; -} - diff --git a/reactos/lib/kbdus/makefile b/reactos/lib/kbdus/makefile index f43a685e0f5..62c5ee46440 100644 --- a/reactos/lib/kbdus/makefile +++ b/reactos/lib/kbdus/makefile @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.2 2003/08/07 04:03:23 royce Exp $ +# $Id: makefile,v 1.3 2003/12/15 20:03:13 weiden Exp $ PATH_TO_TOP = ../.. @@ -8,6 +8,8 @@ TARGET_NAME = kbdus TARGET_BASE = 0x5500000 +TARGET_ENTRY = 0x00000000 + TARGET_CFLAGS = -I$(PATH_TO_TOP)/ntoskrnl/include # require os code to explicitly request A/W version of structs/functions