From 13fc2fb445805679e544d9bf2ef17b03476eed10 Mon Sep 17 00:00:00 2001 From: Filip Navara Date: Wed, 18 Aug 2004 02:16:00 +0000 Subject: [PATCH] Link to our SDK libraries instead of using the W32API ones. svn path=/trunk/; revision=10582 --- reactos/apps/tests/create-links/Makefile | 6 +++--- reactos/apps/tests/mdi/makefile | 6 ++---- reactos/apps/tests/rpcrt4/makefile | 4 ++-- reactos/apps/tests/txtscale/Makefile | 5 ++--- reactos/subsys/system/regedit/makefile | 5 ++--- reactos/subsys/system/setup/makefile | 6 +++--- 6 files changed, 14 insertions(+), 18 deletions(-) diff --git a/reactos/apps/tests/create-links/Makefile b/reactos/apps/tests/create-links/Makefile index 0121d7aec8c..ab17db27e46 100644 --- a/reactos/apps/tests/create-links/Makefile +++ b/reactos/apps/tests/create-links/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1 2003/12/28 21:36:53 gvg Exp $ +# $Id: Makefile,v 1.2 2004/08/18 02:16:00 navaraf Exp $ PATH_TO_TOP = ../../.. @@ -10,9 +10,9 @@ TARGET_APPTYPE = console TARGET_NAME = create-links -TARGET_SDKLIBS = kernel32.a gdi32.a +TARGET_SDKLIBS = kernel32.a gdi32.a ole32.a shell32.a shlwapi.a -TARGET_GCCLIBS = ole32 uuid shell32 shlwapi +TARGET_GCCLIBS = uuid TARGET_OBJECTS = $(TARGET_NAME).o diff --git a/reactos/apps/tests/mdi/makefile b/reactos/apps/tests/mdi/makefile index 72b61b949c9..1b40c5e9599 100644 --- a/reactos/apps/tests/mdi/makefile +++ b/reactos/apps/tests/mdi/makefile @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.1 2003/12/10 19:18:06 weiden Exp $ +# $Id: makefile,v 1.2 2004/08/18 02:16:00 navaraf Exp $ PATH_TO_TOP = ../../.. @@ -10,9 +10,7 @@ TARGET_APPTYPE = windows TARGET_NAME = mdi -TARGET_SDKLIBS = kernel32.a gdi32.a ntdll.a comctl32.a - -TARGET_GCCLIBS = comdlg32 +TARGET_SDKLIBS = kernel32.a gdi32.a ntdll.a comctl32.a comdlg32.a TARGET_OBJECTS = $(TARGET_NAME).o diff --git a/reactos/apps/tests/rpcrt4/makefile b/reactos/apps/tests/rpcrt4/makefile index ed077a27086..46786079eda 100644 --- a/reactos/apps/tests/rpcrt4/makefile +++ b/reactos/apps/tests/rpcrt4/makefile @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.1 2003/11/18 22:08:11 sedwards Exp $ +# $Id: makefile,v 1.2 2004/08/18 02:16:00 navaraf Exp $ PATH_TO_TOP = ../../.. @@ -13,7 +13,7 @@ TARGET_CFLAGS += -D_DISABLE_TIDENTS -D__USE_W32API TARGET_NAME = rpcrt4_test -TARGET_GCCLIBS = rpcrt4 msvcrt +TARGET_SDKLIBS = rpcrt4.a TARGET_OBJECTS = \ rpc.o \ diff --git a/reactos/apps/tests/txtscale/Makefile b/reactos/apps/tests/txtscale/Makefile index 3447a962ee1..fa24392842f 100644 --- a/reactos/apps/tests/txtscale/Makefile +++ b/reactos/apps/tests/txtscale/Makefile @@ -16,9 +16,8 @@ TARGET_CPPFLAGS = -fexceptions -g -O0 -DWIN32 -D_DEBUG -D_WINDOWS -D_MBCS -W -D_ TARGET_SDKLIBS = \ kernel32.a \ user32.a \ - gdi32.a - -TARGET_GCCLIBS = comctl32 + gdi32.a \ + comctl32.a TARGET_OBJECTS = \ txtscale.o \ diff --git a/reactos/subsys/system/regedit/makefile b/reactos/subsys/system/regedit/makefile index 901550b8ac5..aeb81ade90c 100644 --- a/reactos/subsys/system/regedit/makefile +++ b/reactos/subsys/system/regedit/makefile @@ -14,9 +14,8 @@ TARGET_NAME = regedit TARGET_CFLAGS = -D_WIN32_IE=0x0501 -D_WIN32_WINNT=0x0501 -D__USE_W32API -TARGET_GCCLIBS = msvcrt advapi32 kernel32 comctl32 comdlg32 shell32 ole32 - -TARGET_SDKLIBS = kernel32.a advapi32.a user32.a gdi32.a wine_uuid.a ole32.a +TARGET_SDKLIBS = kernel32.a advapi32.a user32.a gdi32.a wine_uuid.a ole32.a \ + shell32.a comctl32.a comdlg32.a TARGET_OBJECTS = \ about.o \ diff --git a/reactos/subsys/system/setup/makefile b/reactos/subsys/system/setup/makefile index 4ced8d09de4..c31b455862d 100644 --- a/reactos/subsys/system/setup/makefile +++ b/reactos/subsys/system/setup/makefile @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.3 2004/01/14 23:17:50 gvg Exp $ +# $Id: makefile,v 1.4 2004/08/18 02:16:00 navaraf Exp $ PATH_TO_TOP = ../../.. @@ -10,9 +10,9 @@ TARGET_NAME = setup TARGET_INSTALLDIR = system32 -TARGET_SDKLIBS = kernel32.a +TARGET_SDKLIBS = kernel32.a ole32.a shell32.a shlwapi.a -TARGET_GCCLIBS = ole32 uuid shell32 shlwapi +TARGET_GCCLIBS = uuid TARGET_CFLAGS = -Wall -Werror -D__USE_W32API -D_WIN32_IE=0x0400