Fix rosapps build

svn path=/trunk/; revision=12385
This commit is contained in:
Gé van Geldorp 2004-12-29 00:31:45 +00:00
parent 1d1a9c5708
commit 3149ec5ad0
6 changed files with 17 additions and 15 deletions

View file

@ -1,4 +1,4 @@
# $Id: Makefile,v 1.12 2004/10/11 01:20:13 sedwards Exp $ # $Id: Makefile,v 1.13 2004/12/29 00:31:45 gvg Exp $
# #
# ReactOS makefile for RegExpl # ReactOS makefile for RegExpl
# #
@ -14,11 +14,11 @@ all: $(TARGET_NAME)$(EXE_POSTFIX)
ROS_DIR=../../../reactos ROS_DIR=../../../reactos
ROS_INC=$(ROS_DIR)/include ROS_INC=$(ROS_DIR)/include
ROS_LIB=$(ROS_DIR)/dk/w32/lib ROS_LIB=$(ROS_DIR)/dk/w32/lib
IMPORT_NTDLL=$(ROS_LIB)/ntdll.a IMPORT_NTDLL=$(ROS_LIB)/libntdll.a
IMPORT_FMIFS=$(ROS_LIB)/fmifs.a IMPORT_FMIFS=$(ROS_LIB)/libfmifs.a
IMPORT_KERNEL32=$(ROS_LIB)/kernel32.a IMPORT_KERNEL32=$(ROS_LIB)/libkernel32.a
IMPORT_ADVAPI32=$(ROS_LIB)/advapi32.a IMPORT_ADVAPI32=$(ROS_LIB)/libadvapi32.a
IMPORT_USER32=$(ROS_LIB)/user32.a IMPORT_USER32=$(ROS_LIB)/libuser32.a
OBJECTS = \ OBJECTS = \
ArgumentParser.o \ ArgumentParser.o \

View file

@ -33,7 +33,6 @@ dibtest \
dirdlg \ dirdlg \
diskspeed \ diskspeed \
dnsquery \ dnsquery \
dump_shared_data \
edit \ edit \
enhmetafile \ enhmetafile \
enumfonts \ enumfonts \
@ -54,7 +53,6 @@ linetest \
lpc \ lpc \
map_dup_inherit \ map_dup_inherit \
mdi \ mdi \
miditest \
mktime \ mktime \
moztest \ moztest \
mstest \ mstest \
@ -95,6 +93,10 @@ wm_erasebkgnd \
wm_paint \ wm_paint \
zwcontinue zwcontinue
# Deactivated tests:
# dump_shared_data
# miditest
all: $(TEST_APPS) all: $(TEST_APPS)
depends: depends:

View file

@ -13,8 +13,8 @@ PROGS= lpcsrv.exe lpcclt.exe
CFLAGS = $(STD_CFLAGS) CFLAGS = $(STD_CFLAGS)
LIBS = $(SDK_PATH_LIB)/kernel32.a \ LIBS = $(SDK_PATH_LIB)/libkernel32.a \
$(SDK_PATH_LIB)/ntdll.a $(SDK_PATH_LIB)/libntdll.a
all: $(PROGS) all: $(PROGS)

View file

@ -13,8 +13,8 @@ PROGS = msserver.exe msclient.exe
CFLAGS = $(STD_CFLAGS) CFLAGS = $(STD_CFLAGS)
LIBS = $(SDK_PATH_LIB)/kernel32.a \ LIBS = $(SDK_PATH_LIB)/libkernel32.a \
$(SDK_PATH_LIB)/ntdll.a $(SDK_PATH_LIB)/libntdll.a
all: $(PROGS) all: $(PROGS)

View file

@ -13,7 +13,7 @@ PROGS = npserver.exe npclient.exe
CFLAGS = $(STD_CFLAGS) CFLAGS = $(STD_CFLAGS)
LIBS = $(SDK_PATH_LIB)/kernel32.a LIBS = $(SDK_PATH_LIB)/libkernel32.a
all: $(PROGS) all: $(PROGS)

View file

@ -13,8 +13,8 @@ PROGS= shmsrv.exe shmclt.exe
CFLAGS = $(STD_CFLAGS) CFLAGS = $(STD_CFLAGS)
LIBS = $(SDK_PATH_LIB)/kernel32.a \ LIBS = $(SDK_PATH_LIB)/libkernel32.a \
$(SDK_PATH_LIB)/ntdll.a $(SDK_PATH_LIB)/libntdll.a
all: $(PROGS) all: $(PROGS)