Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 01:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Updated Makefile for wine_unicode.dll wrc and winebuild.

Browse source 
Added wrc to rules.mk

These are not used yet.

svn path=/trunk/; revision=2787
This commit is contained in:
Steven Edwards 2002-03-27 04:38:58 +00:00
parent c620a68b29
commit 29e7f88439
2 changed files with 56 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
reactos/Makefile
View file

@ -72,19 +72,29 @@ APPS = args hello test cat bench apc shm lpc thread event file gditest \
objdir atomtest winhello partinfo mutex stats pice isotest objdir atomtest winhello partinfo mutex stats pice isotest
#lzexpand (missing imports) #
#dsound (missing winmm.dll) # 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.
#
WINE_OTHER = unicode
WINE_TOOLS = wrc winebuild
WINE_DLLS = rpcrt4 mapi32 ole32 oleaut32 oledlg olepro32 olecli olesvr \ WINE_DLLS = rpcrt4 mapi32 ole32 oleaut32 oledlg olepro32 olecli olesvr \
shell32 shlwapi comctl32 shfolder shdocvw commdlg \ shell32 shlwapi comctl32 shfolder shdocvw commdlg \
ddraw dinput dplay dplayx \ ddraw dinput dplay dplayx \
psapi richedit serialui tapi32 urlmon winspool wintrust psapi richedit serialui tapi32 urlmon winspool wintrust
#lzexpand (missing imports)
#dsound (missing winmm.dll)
WINE_PROGS = clock cmdlgtst control notepad osversioncheck \ WINE_PROGS = clock cmdlgtst control notepad osversioncheck \
progman uninstaller view wcmd winefile winemine \ progman uninstaller view wcmd winefile winemine \
winver winver
ifeq ($(ROS_BUILD_WINE),yes) ifeq ($(ROS_BUILD_WINE),yes)
WINE_MODULES = $(WINE_DLLS) $(WINE_PROGS) WINE_MODULES = $(WINE_OTHER) $(WINE_TOOLS) $(WINE_DLLS) $(WINE_PROGS)
else else
WINE_MODULES = WINE_MODULES =
endif endif
@ -166,6 +176,47 @@ $(APPS:%=%_install): %_install:
.PHONY: $(APPS) $(APPS:%=%_implib) $(APPS:%=%_clean) $(APPS:%=%_install) $(APPS:%=%_dist) .PHONY: $(APPS) $(APPS:%=%_implib) $(APPS:%=%_clean) $(APPS:%=%_install) $(APPS:%=%_dist)
#
# Other Wine Modules
#
$(WINE_OTHER): %:
make -f makefile.ros -C $(WINE_PATH)/$*
$(WINE_OTHER:%=%_implib): %_implib:
make -f makefile.ros -C $(WINE_PATH)/$* implib
$(WINE_OTHER:%=%_clean): %_clean:
make -f makefile.ros -C $(WINE_PATH)/$* clean
$(WINE_OTHER:%=%_dist): %_dist:
make -f makefile.ros -C $(WINE_PATH)/$* dist
$(WINE_OTHER:%=%_install): %_install:
make -f makefile.ros -C $(WINE_PATH)/$* install
.PHONY: $(WINE_OTHER) $(WINE_OTHER:%=%_implib) $(WINE_OTHER:%=%_clean) $(WINE_OTHER:%=%_install) $(WINE_OTHER:%=%_dist)
#
# Wine Tools
#
$(WINE_TOOLS): %:
make -f makefile.ros -C $(WINE_PATH)/tools/$*
$(WINE_TOOLS:%=%_implib): %_implib:
make -f makefile.ros -C $(WINE_PATH)/tools/$* implib
$(WINE_TOOLS:%=%_clean): %_clean:
make -f makefile.ros -C $(WINE_PATH)/tools/$* clean
$(WINE_TOOLS:%=%_dist): %_dist:
make -f makefile.ros -C $(WINE_PATH)/tools/$* dist
$(WINE_TOOLS:%=%_install): %_install:
make -f makefile.ros -C $(WINE_PATH)/tools/$* install
.PHONY: $(WINE_DLLS) $(WINE_DLLS:%=%_implib) $(WINE_DLLS:%=%_clean) $(WINE_DLLS:%=%_install) $(WINE_DLLS:%=%_dist)
# #
# Wine DLLs # Wine DLLs
# #

1
reactos/rules.mak
View file

@ -67,6 +67,7 @@ AS = $(PREFIX)gcc -c -x assembler-with-cpp
CPP = $(PREFIX)cpp CPP = $(PREFIX)cpp
AR = $(PREFIX)ar AR = $(PREFIX)ar
RC = $(PREFIX)windres RC = $(PREFIX)windres
WRC = ../$(PATH_TO_TOP)/tools/wrc/wrc
RCINC = --include-dir $(PATH_TO_TOP)/include RCINC = --include-dir $(PATH_TO_TOP)/include
OBJCOPY = $(PREFIX)objcopy OBJCOPY = $(PREFIX)objcopy
TOOLS_PATH = $(PATH_TO_TOP)/tools TOOLS_PATH = $(PATH_TO_TOP)/tools