ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-08-30 12:23:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes for make bootcd

Browse Source 
svn path=/trunk/; revision=21123
This commit is contained in:
Maarten Bosma
2006-02-17 22:51:46 +00:00
parent eae79b5737
commit 7dfedba9e1
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/lib/3rdparty/zlib/zlib.mak
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
ZLIB_BASE = $(LIB_BASE_)zlib
ZLIB_BASE = $(LIB_BASE_)3rdparty$(SEP)zlib
ZLIB_BASE_ = $(ZLIB_BASE)$(SEP)
ZLIB_INT = $(INTERMEDIATE_)$(ZLIB_BASE)
ZLIB_INT_ = $(INTERMEDIATE_)$(ZLIB_BASE)$(SEP)
reactos/lib/lib.mak
+1
View File
@@ -2,3 +2,4 @@ LIB_BASE = lib
LIB_BASE_ = $(LIB_BASE)$(SEP)
include lib/inflib/inflib.mak
include lib/3rdparty/zlib/zlib.mak
reactos/tools/rbuild/backend/mingw/mingw.cpp
+5 -5
View File
@@ -1023,11 +1023,11 @@ MingwBackend::OutputModuleInstallTargets ()
string
MingwBackend::GetRegistrySourceFiles ()
{
return "bootdata" + sSep + "hivecls.inf "
"bootdata" + sSep + "hivedef.inf "
"bootdata" + sSep + "hiveinst.inf "
"bootdata" + sSep + "hivesft.inf "
"bootdata" + sSep + "hivesys.inf";
return "boot" + sSep + "bootdata" + sSep + "hivecls.inf "
"boot" + sSep + "bootdata" + sSep + "hivedef.inf "
"boot" + sSep + "bootdata" + sSep + "hiveinst.inf "
"boot" + sSep + "bootdata" + sSep + "hivesft.inf "
"boot" + sSep + "bootdata" + sSep + "hivesys.inf";
}
string
reactos/tools/rbuild/backend/mingw/modulehandler.cpp
+2 -2
View File
@@ -2937,7 +2937,7 @@ MingwIsoModuleHandler::GenerateIsoModuleTarget ()
string reactosInf = PassThruCacheDirectory (
NormalizeFilename ( bootcdReactosNoFixup + sSep + "reactos.inf" ),
backend->outputDirectory );
string reactosDff = NormalizeFilename ( "bootdata" + sSep + "packages" + sSep + "reactos.dff" );
string reactosDff = NormalizeFilename ( "boot" + sSep + "bootdata" + sSep + "packages" + sSep + "reactos.dff" );
string cdDirectories = GetCdDirectories ( bootcdDirectory );
vector<string> vCdFiles;
GetCdFiles ( vCdFiles );
@@ -3059,7 +3059,7 @@ MingwLiveIsoModuleHandler::OutputProfilesDirectoryCommands ( string& livecdDirec
CreateDirectory ( livecdDirectory + sSep + "Profiles" + sSep + "Default User" + sSep + "Desktop" );
CreateDirectory ( livecdDirectory + sSep + "Profiles" + sSep + "Default User" + sSep + "My Documents" );
string livecdIni = "bootdata" + sSep + "livecd.ini";
string livecdIni = "boot" + sSep + "bootdata" + sSep + "livecd.ini";
OutputCopyCommand ( livecdIni,
"freeldr.ini",
livecdDirectory );