CABMAN_TARGET = \
$(EXEPREFIX)$(CABMAN_OUT_)cabman$(EXEPOSTFIX)
-CABMAN_SOURCES = $(addprefix $(CABMAN_INT_), \
+CABMAN_SOURCES = $(addprefix $(CABMAN_BASE_), \
cabinet.cxx \
dfp.cxx \
main.cxx \
$(ECHO_LD)
${host_gpp} $(CABMAN_OBJECTS) $(CABMAN_HOST_LFLAGS) -o $@
-$(CABMAN_INT_)cabinet.o: $(CABMAN_BASE_)cabinet.cxx $(CABMAN_BASE_DIR)
+$(CABMAN_INT_)cabinet.o: $(CABMAN_BASE_)cabinet.cxx $(CABMAN_INT)
$(ECHO_CC)
${host_gpp} $(CABMAN_HOST_CFLAGS) -c $< -o $@
-$(CABMAN_INT_)dfp.o: $(CABMAN_BASE_)dfp.cxx $(CABMAN_BASE_DIR)
+$(CABMAN_INT_)dfp.o: $(CABMAN_BASE_)dfp.cxx $(CABMAN_INT)
$(ECHO_CC)
${host_gpp} $(CABMAN_HOST_CFLAGS) -c $< -o $@
-$(CABMAN_INT_)main.o: $(CABMAN_BASE_)main.cxx $(CABMAN_BASE_DIR)
+$(CABMAN_INT_)main.o: $(CABMAN_BASE_)main.cxx $(CABMAN_INT)
$(ECHO_CC)
${host_gpp} $(CABMAN_HOST_CFLAGS) -c $< -o $@
-$(CABMAN_INT_)mszip.o: $(CABMAN_BASE_)mszip.cxx $(CABMAN_BASE_DIR)
+$(CABMAN_INT_)mszip.o: $(CABMAN_BASE_)mszip.cxx $(CABMAN_INT)
$(ECHO_CC)
${host_gpp} $(CABMAN_HOST_CFLAGS) -c $< -o $@
-$(CABMAN_INT_)raw.o: $(CABMAN_BASE_)raw.cxx $(CABMAN_BASE_DIR)
+$(CABMAN_INT_)raw.o: $(CABMAN_BASE_)raw.cxx $(CABMAN_INT)
$(ECHO_CC)
${host_gpp} $(CABMAN_HOST_CFLAGS) -c $< -o $@
\r
#define CLEAN_FILE(f) clean_files.push_back ( f ); /*if ( module.name == "crt" ) printf ( "%s(%i): clean: %s\n", __FILE__, __LINE__, f.c_str() )*/\r
\r
-static string ros_temp = "$(ROS_TEMPORARY)";\r
+static string ros_temp = "$(TEMPORARY)";\r
MingwBackend*\r
MingwModuleHandler::backend = NULL;\r
FILE*\r
const string& sourceFilename,\r
string_list* pclean_files ) const\r
{\r
+ Directory* directoryTree;\r
+\r
string newExtension;\r
string extension = GetExtension ( sourceFilename );\r
if ( extension == ".rc" || extension == ".RC" )\r
newExtension = ".stubs.o";\r
else\r
newExtension = ".o";\r
+ \r
+ if ( module.type == BootSector )\r
+ directoryTree = backend->outputDirectory;\r
+ else\r
+ directoryTree = backend->intermediateDirectory;\r
+\r
string obj_file = PassThruCacheDirectory (\r
NormalizeFilename ( ReplaceExtension (\r
RemoveVariables ( sourceFilename ),\r
newExtension ) ),\r
- backend->intermediateDirectory );\r
+ directoryTree );\r
if ( pclean_files )\r
{\r
string_list& clean_files = *pclean_files;\r
if ( m.bootstrap != NULL )\r
{\r
string targetFilenameNoFixup ( bootcdDirectory + SSEP + m.bootstrap->base + SSEP + m.bootstrap->nameoncd );\r
- string targetFilename ( GetTargetMacro ( module ) );\r
+ string targetFilename = MingwModuleHandler::PassThruCacheDirectory (\r
+ NormalizeFilename ( targetFilenameNoFixup ),\r
+ backend->outputDirectory );\r
fprintf ( fMakefile,\r
"\t$(ECHO_CP)\n" );\r
fprintf ( fMakefile,\r
{\r
const Module& m = *module.project.modules[i];\r
if ( m.bootstrap != NULL )\r
- out.push_back ( NormalizeFilename ( m.GetPath () ) );\r
+ {\r
+ string filename = PassThruCacheDirectory (\r
+ NormalizeFilename ( m.GetPath () ),\r
+ backend->outputDirectory );\r
+ out.push_back ( filename );\r
+ }\r
}\r
}\r
\r
for ( size_t i = 0; i < module.project.cdfiles.size (); i++ )\r
{\r
const CDFile& cdfile = *module.project.cdfiles[i];\r
- out.push_back ( NormalizeFilename ( cdfile.GetPath () ) );\r
+ out.push_back ( cdfile.GetPath () );\r
}\r
}\r
\r
MingwIsoModuleHandler::GenerateIsoModuleTarget ()\r
{\r
string bootcdDirectory = "cd";\r
- string isoboot = NormalizeFilename ( "boot/freeldr/bootsect/isoboot.o" );\r
+ string isoboot = PassThruCacheDirectory (\r
+ NormalizeFilename ( "boot/freeldr/bootsect/isoboot.o" ),\r
+ backend->intermediateDirectory );\r
string bootcdReactosNoFixup = bootcdDirectory + "/reactos";\r
string bootcdReactos = PassThruCacheDirectory (\r
NormalizeFilename ( bootcdReactosNoFixup ),\r