Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-05 13:11:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

Updates to accomodate changes and additions with the various sub-modules.

Browse source 
svn path=/trunk/; revision=3960
This commit is contained in:
Robert Dickenson 2003-01-07 18:20:34 +00:00
parent 158847adad
commit 9c58563e7b
5 changed files with 123 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reactos/Makefile
View file

@ -93,8 +93,8 @@ TEST_APPS = alive apc args atomtest bench consume copymove count dump_shared_dat
UTIL_APPS = cat objdir partinfo sc stats
# External (sub)systems for ReactOS
# wine posix os2 java
EXTERNALS = posix
# rosapps wine posix os2 (requires c++) java (non-existant)
EXTERNALS = rosapps wine posix os2
ifeq ($(ROS_BUILD_EXT),yes)
EXT_MODULES = $(EXTERNALS)

117
reactos/dk/w32/Makefile
View file

@ -1,4 +1,4 @@
# $Id: Makefile,v 1.4 2002/10/28 15:20:37 robd Exp $
# $Id: Makefile,v 1.5 2003/01/07 18:20:34 robd Exp $
#
# PROJECT : ReactOS Operating System
# FILE : reactos/dk/w32/Makefile
@ -44,9 +44,9 @@ MODULES_NET=\
$(TARGET_FOLDER_LIB)/wshirda.a\
$(TARGET_FOLDER_LIB)/wsock32.a
MODULES_COM=\
$(TARGET_FOLDER_LIB)/ole32.a\
$(TARGET_FOLDER_LIB)/oleaut32.a
#MODULES_COM=\
# $(TARGET_FOLDER_LIB)/ole32.a\
# $(TARGET_FOLDER_LIB)/oleaut32.a\
# $(TARGET_FOLDER_LIB)/rpcrt4.a
MODULES_CRT=\
@ -56,14 +56,30 @@ MODULES_CRT=\
MODULES_MISC=\
$(TARGET_FOLDER_LIB)/version.a
MODULES_WINE=\
$(TARGET_FOLDER_LIB)/libwine.a\
$(TARGET_FOLDER_LIB)/rpcrt4.a\
$(TARGET_FOLDER_LIB)/shlwapi.a\
$(TARGET_FOLDER_LIB)/ole32.a\
$(TARGET_FOLDER_LIB)/oleaut32.a\
$(TARGET_FOLDER_LIB)/lz32.a\
$(TARGET_FOLDER_LIB)/wininet.a\
$(TARGET_FOLDER_LIB)/wine_unicode.a
MODULES_CONTRIB=\
$(TARGET_FOLDER_LIB)/perl58.a
MODULES =\
$(MODULES_CORE)\
$(MODULES_COM)\
$(MODULES_ADVANCED)\
$(MODULES_SHELL)\
$(MODULES_NET)\
$(MODULES_COM)\
$(MODULES_CRT)\
$(MODULES_MISC)
$(MODULES_MISC)\
$(MODULES_WINE)
# $(MODULES_CONTRIB)\
# --- Rules ---
@ -175,23 +191,23 @@ $(TARGET_FOLDER_LIB)/wsock32.a: $(PATH_TO_TOP)/lib/wsock32/wsock32.def
# --- COM ---
$(TARGET_FOLDER_LIB)/ole32.a: $(PATH_TO_TOP)/lib/ole32/ole32.def
$(DLLTOOL) \
$(DTFLAGS)\
-D ole32.dll\
-d $(PATH_TO_TOP)/lib/ole32/ole32.def
#$(TARGET_FOLDER_LIB)/ole32.a: $(PATH_TO_TOP)/lib/ole32/ole32.def
# $(DLLTOOL) \
# $(DTFLAGS)\
# -D ole32.dll\
# -d $(PATH_TO_TOP)/lib/ole32/ole32.def
$(TARGET_FOLDER_LIB)/oleaut32.a: $(PATH_TO_TOP)/lib/oleaut32/oleaut32.def
$(DLLTOOL) \
$(DTFLAGS)\
-D oleaut32.dll\
-d $(PATH_TO_TOP)/lib/oleaut32/oleaut32.def
#$(TARGET_FOLDER_LIB)/oleaut32.a: $(PATH_TO_TOP)/lib/oleaut32/oleaut32.def
# $(DLLTOOL) \
# $(DTFLAGS)\
# -D oleaut32.dll\
# -d $(PATH_TO_TOP)/lib/oleaut32/oleaut32.def
$(TARGET_FOLDER_LIB)/rpcrt4.a: $(PATH_TO_TOP)/lib/rpcrt4/rpcrt4.def
$(DLLTOOL) \
$(DTFLAGS)\
-D rpcrt4.dll\
-d $(PATH_TO_TOP)/lib/rpcrt4/rpcrt4.def
#$(TARGET_FOLDER_LIB)/rpcrt4.a: $(PATH_TO_TOP)/lib/rpcrt4/rpcrt4.def
# $(DLLTOOL) \
# $(DTFLAGS)\
# -D rpcrt4.dll\
# -d $(PATH_TO_TOP)/lib/rpcrt4/rpcrt4.def
# --- CRT ---
@ -215,6 +231,65 @@ $(TARGET_FOLDER_LIB)/version.a: $(PATH_TO_TOP)/lib/version/version.def
-D version.dll\
-d $(PATH_TO_TOP)/lib/version/version.def
# --- WINE ---
$(TARGET_FOLDER_LIB)/ole32.a: $(PATH_TO_TOP)/../wine/dlls/ole32/ole32.def
$(DLLTOOL) \
$(DTFLAGS)\
-D ole32.dll\
-d $(PATH_TO_TOP)/../wine/dlls/ole32/ole32.def
$(TARGET_FOLDER_LIB)/oleaut32.a: $(PATH_TO_TOP)/../wine/dlls/oleaut32/oleaut32.def
$(DLLTOOL) \
$(DTFLAGS)\
-D oleaut32.dll\
-d $(PATH_TO_TOP)/../wine/dlls/oleaut32/oleaut32.def
$(TARGET_FOLDER_LIB)/rpcrt4.a: $(PATH_TO_TOP)/../wine/dlls/rpcrt4/rpcrt4.def
$(DLLTOOL) \
$(DTFLAGS)\
-D rpcrt4.dll\
-d $(PATH_TO_TOP)/../wine/dlls/rpcrt4/rpcrt4.def
$(TARGET_FOLDER_LIB)/shlwapi.a: $(PATH_TO_TOP)/../wine/dlls/shlwapi/shlwapi.def
$(DLLTOOL) \
$(DTFLAGS)\
-D shlwapi.dll\
-d $(PATH_TO_TOP)/../wine/dlls/shlwapi/shlwapi.def
$(TARGET_FOLDER_LIB)/wininet.a: $(PATH_TO_TOP)/../wine/dlls/wininet/wininet.def
$(DLLTOOL) \
$(DTFLAGS)\
-D wininet.dll\
-d $(PATH_TO_TOP)/../wine/dlls/wininet/wininet.def
$(TARGET_FOLDER_LIB)/lz32.a: $(PATH_TO_TOP)/../wine/dlls/lzexpand/lz32.def
$(DLLTOOL) \
$(DTFLAGS)\
-D lz32.dll\
-d $(PATH_TO_TOP)/../wine/dlls/lzexpand/lz32.def
$(TARGET_FOLDER_LIB)/libwine.a: $(PATH_TO_TOP)/../wine/library/libwine.def
$(DLLTOOL) \
$(DTFLAGS)\
-D libwine.dll\
-d $(PATH_TO_TOP)/../wine/library/libwine.def
$(TARGET_FOLDER_LIB)/wine_unicode.a: $(PATH_TO_TOP)/../wine/unicode/wine_unicode.def
$(DLLTOOL) \
$(DTFLAGS)\
-D wine_unicode.dll\
-d $(PATH_TO_TOP)/../wine/unicode/wine_unicode.def
# --- CONTRIB ---
$(TARGET_FOLDER_LIB)/perl58.a: $(PATH_TO_TOP)/../contrib/perl-5.8.0/win32/perldll.def
$(DLLTOOL) \
$(DTFLAGS)\
-D perl58.dll\
-d $(PATH_TO_TOP)/../contrib/perl-5.8.0/win32/perldll.def
# --- Service rules ---
clean:

20
reactos/install.bat
View file

@ -5,7 +5,6 @@ goto Install
:NoParameter
set ROS_INSTALL=c:\reactos
:Install
echo on
echo Installing to %ROS_INSTALL%
@echo off
@ -140,3 +139,22 @@ copy media\fonts\helb____.ttf %ROS_INSTALL%\media\fonts
copy media\fonts\timr____.ttf %ROS_INSTALL%\media\fonts
rem copy media\nls\*.nls %ROS_INSTALL%\system32
copy ntoskrnl\ntoskrnl.map %ROS_INSTALL%\symbols
if %ROS_BUILD_EXT == "" goto Finish
echo Installing extra programs from rosapps directory...
pushd ..\rosapps
call install.bat
popd
echo Installing targets modules ported from WINE...
pushd ..\wine
call install.bat
popd
echo Installing targets for POSIX+ support...
pushd ..\posix
call install.bat
popd
echo Done.
:Finish

2
reactos/installwine.bat
View file

@ -47,7 +47,7 @@ copy ..\wine\dlls\shfolder\shfolder.dll %WINE_INSTALL%
copy ..\wine\dlls\shlwapi\shlwapi.dll %WINE_INSTALL%
copy ..\wine\dlls\tapi32\tapi32.dll %WINE_INSTALL%
copy ..\wine\dlls\urlmon\urlmon.dll %WINE_INSTALL%
REMcopy ..\wine\dlls\version\version.dll %WINE_INSTALL%
REM copy ..\wine\dlls\version\version.dll %WINE_INSTALL%
copy ..\wine\dlls\wintrust\wintrust.dll %WINE_INSTALL%
copy ..\wine\dlls\winspool\winspool.drv %WINE_INSTALL%
REM

5
reactos/rules.mak
View file

@ -120,5 +120,10 @@ POSIX_PATH=$(PATH_TO_TOP)/../posix
POSIX_PATH_LIB=$(POSIX_PATH)/lib
POSIX_PATH_INC=$(POSIX_PATH)/include
# OS/2 Integration
OS2_PATH=$(PATH_TO_TOP)/../os2
OS2_PATH_LIB=$(OS2_PATH)/lib
OS2_PATH_INC=$(OS2_PATH)/include
# Other systems integration
ROOT_PATH=$(PATH_TO_TOP)/..