BUS = acpi isapnp pci
# User mode libraries
-# advapi32 crtdll fmifs gdi32 kernel32 msafd msvcrt ntdll ole32
-# oleaut32 psapi rpcrt4 secur32 shell32 user32 version ws2_32
-DLLS = advapi32 crtdll fmifs gdi32 kernel32 msafd msvcrt ntdll \
- secur32 user32 version ws2_32
+# advapi32 crtdll fmifs gdi32 kernel32 libpcap packet msafd msvcrt ntdll ole32
+# oleaut32 psapi rpcrt4 secur32 shell32 user32 version ws2help ws2_32 wsock32 wshirda
+DLLS = advapi32 crtdll fmifs gdi32 kernel32 packet msafd msvcrt ntdll \
+ secur32 user32 version winmm ws2help ws2_32 wshirda
SUBSYS = smss win32k csrss
#
DRIVERS_LIB = bzip2 zlib
# Kernel mode device drivers
-# beep blue floppy ide keyboard mouse null parallel ramdrv serial vga vidport
-DEVICE_DRIVERS = blue floppy ide null vga vidport
+# beep blue floppy ide keyboard mouse null parallel ramdrv serenum serial vga vidport
+DEVICE_DRIVERS = beep blue floppy ide null serial vga vidport
# Kernel mode input drivers
# keyboard mouclass psaux sermouse
# Kernel mode file system drivers
# cdfs ext2 fs_rec ms np vfat
-FS_DRIVERS = cdfs fs_rec ms np vfat
+FS_DRIVERS = cdfs fs_rec ms np vfat mup ntfs
# Kernel mode networking drivers
-# afd ndis tcpip tdi wshtcpip
-NET_DRIVERS = afd ndis tcpip tdi wshtcpip
+# afd ndis packet tcpip tdi wshtcpip
+NET_DRIVERS = afd ndis packet tcpip tdi wshtcpip
# Kernel mode networking device drivers
# ne2000
# System applications
# autochk lsass services shell winlogon
-SYS_APPS = autochk services shell winlogon
+SYS_APPS = autochk services shell winlogon gstart usetup
+
+# System services
+# rpcss eventlog
+SYS_SVC = rpcss eventlog
# Test applications
# alive apc args atomtest bench consume count dump_shared_data
# pteb regtest sectest shm simple thread vmtest winhello
TEST_APPS = alive apc args atomtest bench consume count dump_shared_data \
event file gditest hello isotest lpc mstest mutex nptest \
- pteb regtest sectest shm simple thread tokentest vmtest winhello
+ pteb regtest sectest shm simple thread tokentest vmtest winhello dibtest
# Test applications
# cabman cat net objdir partinfo pice ps stats
UTIL_APPS = cat objdir partinfo stats
#
-# Wine userspace win32 subsystem plus other stuff. This will all be moved
-# to helper makefile down the road and there will be peace on earth.
+# Win32 Subsystem support (Based on WINE)
+# FIXME: Move to this its own Makefile
#
-WINE_OTHER = unicode
+WINE_OTHER = unicode library
+
+WINE_TOOLS = bin2res wrc winebuild
+
+WINE_DLLS = comcat crtdll comctl32 commdlg dsound dplayx imagehlp ole32 richedit \
+shlwapi shell32 shdocvw twain wininet urlmon winspool \
+rpcrt4 mapi32 oleaut32 oledlg olepro32 olecli olesvr shfolder
-WINE_TOOLS = wrc winebuild
+#rpcrt4 mapi32 # needed to make rcprt4 implib
-WINE_DLLS = rpcrt4 mapi32 ole32 oleaut32 oledlg olepro32 olecli olesvr \
- shell32 shlwapi comctl32 shfolder shdocvw commdlg \
- ddraw dinput dplay dplayx \
- psapi richedit serialui tapi32 urlmon winspool wintrust
- #lzexpand (missing imports)
- #dsound (missing winmm.dll)
+# winmm ddraw dinput dplay serialui tapi32 wintrust
+# msinfo lzexpand (missing imports)
+WINE_PROGS = control expand osversioncheck regedit regsvr32 winver
+# uninstaller
+# (waiting on wrc fix for the rest of these)
+# clock cmdlgtst notepad progman wcmd
+# winefile winemine winetest uninstaller
-WINE_PROGS = clock cmdlgtst control notepad osversioncheck \
- progman uninstaller view wcmd winefile winemine \
- winver
ifeq ($(ROS_BUILD_WINE),yes)
WINE_MODULES = $(WINE_OTHER) $(WINE_TOOLS) $(WINE_DLLS) $(WINE_PROGS)
$(NET_DRIVERS) $(NET_DEVICE_DRIVERS) $(STORAGE_DRIVERS)
all: tools dk implib $(COMPONENTS) $(HALS) $(BUS) $(DLLS) $(SUBSYS) \
- $(LOADERS) $(KERNEL_DRIVERS) $(SYS_APPS) $(TEST_APPS) \
+ $(LOADERS) $(KERNEL_DRIVERS) $(SYS_APPS) $(SYS_SVC) $(TEST_APPS) \
$(UTIL_APPS) $(WINE_MODULES)
implib: $(COMPONENTS:%=%_implib) $(HALS:%=%_implib) $(BUS:%=%_implib) \
$(DLLS:%=%_implib) $(LOADERS:%=%_implib) \
$(KERNEL_DRIVERS:%=%_implib) $(SUBSYS:%=%_implib) \
- $(SYS_APPS:%=%_implib) $(TEST_APPS:%=%_implib) \
- $(UTIL_APPS:%=%_implib) $(WINE_MODULES:%=%_implib)
+ $(SYS_APPS:%=%_implib) $(SYS_SVC:%=%_implib) \
+ $(TEST_APPS:%=%_implib) $(UTIL_APPS:%=%_implib) \
+ $(WINE_MODULES:%=%_implib)
-clean: dk_clean $(HALS:%=%_clean) \
+clean: tools dk_clean $(HALS:%=%_clean) \
$(COMPONENTS:%=%_clean) $(BUS:%=%_clean) $(DLLS:%=%_clean) \
$(LOADERS:%=%_clean) $(KERNEL_DRIVERS:%=%_clean) $(SUBSYS:%=%_clean) \
- $(SYS_APPS:%=%_clean) $(TEST_APPS:%=%_clean) $(UTIL_APPS:%=%_clean) \
- $(NET_APPS:%=%_clean) $(WINE_MODULES:%=%_clean) clean_after tools_clean
+ $(SYS_APPS:%=%_clean) $(SYS_SVC:%=%_clean) $(TEST_APPS:%=%_clean) \
+ $(UTIL_APPS:%=%_clean) $(NET_APPS:%=%_clean) $(WINE_MODULES:%=%_clean) \
+ clean_after tools_clean
clean_after:
$(RM) $(PATH_TO_TOP)/include/roscfg.h
$(COMPONENTS:%=%_install) $(HALS:%=%_install) $(BUS:%=%_install) \
$(DLLS:%=%_install) $(LOADERS:%=%_install) \
$(KERNEL_DRIVERS:%=%_install) $(SUBSYS:%=%_install) \
- $(SYS_APPS:%=%_install) $(TEST_APPS:%=%_install) \
- $(UTIL_APPS:%=%_install) $(WINE_MODULES:%=%_install)
+ $(SYS_APPS:%=%_install) $(SYS_SVC:%=%_install) \
+ $(TEST_APPS:%=%_install) $(UTIL_APPS:%=%_install) \
+ $(WINE_MODULES:%=%_install)
dist: $(TOOLS_PATH)/rcopy$(EXE_POSTFIX) dist_clean dist_dirs \
$(HALS:%=%_dist) $(COMPONENTS:%=%_dist) $(BUS:%=%_dist) $(DLLS:%=%_dist) \
$(LOADERS:%=%_dist) $(KERNEL_DRIVERS:%=%_dist) $(SUBSYS:%=%_dist) \
- $(SYS_APPS:%=%_dist) $(TEST_APPS:%=%_dist) $(UTIL_APPS:%=%_dist) \
- $(NET_APPS:%=%_dist) $(WINE_MODULES:%=%_dist)
+ $(SYS_APPS:%=%_dist) $(SYS_SVC:%=%_dist) $(TEST_APPS:%=%_dist) \
+ $(UTIL_APPS:%=%_dist) $(NET_APPS:%=%_dist) $(WINE_MODULES:%=%_dist)
.PHONY: all implib clean clean_before install dist
.PHONY: $(SYS_APPS) $(SYS_APPS:%=%_implib) $(SYS_APPS:%=%_clean) $(SYS_APPS:%=%_install) $(SYS_APPS:%=%_dist)
+#
+# System Services
+#
+$(SYS_SVC): %:
+ make -C services/$*
+
+$(SYS_SVC:%=%_implib): %_implib:
+ make -C services/$* implib
+
+$(SYS_SVC:%=%_clean): %_clean:
+ make -C services/$* clean
+
+$(SYS_SVC:%=%_dist): %_dist:
+ make -C services/$* dist
+
+$(SYS_SVC:%=%_install): %_install:
+ make -C services/$* install
+
+.PHONY: $(SYS_SVC) $(SYS_SVC:%=%_implib) $(SYS_SVC:%=%_clean) $(SYS_SVC:%=%_install) $(SYS_SVC:%=%_dist)
+
#
# Test Applications
$(CP) bootc.lst $(INSTALL_DIR)/bootc.lst
$(CP) boot.bat $(INSTALL_DIR)/boot.bat
$(CP) aboot.bat $(INSTALL_DIR)/aboot.bat
- $(CP) system.hiv $(INSTALL_DIR)/system32/system.hiv
+ $(CP) system.hiv $(INSTALL_DIR)/system32/config/system.hiv
$(CP) media/fonts/helb____.ttf $(INSTALL_DIR)/media/fonts/helb____.ttf
$(CP) media/fonts/timr____.ttf $(INSTALL_DIR)/media/fonts/timr____.ttf
find . -name "*.[ch]" -print | etags --language=c -
# EOF
+
projects / reactos.git / blobdiff