add targets for creating MSVC project files to Makefile
fix bug in msvc backend:
VS.NET project files are not destroyed anymore
when creating VC6 project files
Modified: trunk/reactos/Makefile
Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp
_____
Modified: trunk/reactos/Makefile
--- trunk/reactos/Makefile 2005-10-20 14:27:02 UTC (rev 18631)
+++ trunk/reactos/Makefile 2005-10-20 15:04:55 UTC (rev 18632)
@@ -321,6 +321,26 @@
$(ECHO_WMC)
$(Q)$(WMC_TARGET) -i -H $(ERRCODES_H) -o $(ERRCODES_RC)
$(KERNEL32_MC)
+.PHONY: msvc6
+msvc6: $(RBUILD_TARGET)
+ $(ECHO_RBUILD)
+ $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs6.00 msvc
+
+.PHONY: msvc7
+msvc7: $(RBUILD_TARGET)
+ $(ECHO_RBUILD)
+ $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.00 msvc
+
+.PHONY: msvc71
+msvc71: $(RBUILD_TARGET)
+ $(ECHO_RBUILD)
+ $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.10 msvc
+
+.PHONY: msvc8
+msvc8: $(RBUILD_TARGET)
+ $(ECHO_RBUILD)
+ $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs8.00 msvc
+
.PHONY: makefile_auto_clean
makefile_auto_clean:
-@$(rm) makefile.auto $(PREAUTO) 2>$(NUL)
_____
Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp
--- trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp 2005-10-20
14:27:02 UTC (rev 18631)
+++ trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp 2005-10-20
15:04:55 UTC (rev 18632)
@@ -53,35 +53,40 @@
void MSVCBackend::Process()
{
+
string filename_dsw = ProjectNode.name + ".dsw";
string filename_sln = ProjectNode.name + ".sln";
+
+ if (configuration.VSProjectVersion == "6.00")
+ printf ( "Creating MSVC workspace: %s\n",
filename_dsw.c_str() );
+ else
+ printf ( "Creating MSVC workspace: %s\n",
filename_sln.c_str() );
- printf ( "Creating MSVC workspace: %s\n", filename_dsw.c_str()
);
- printf ( "Creating MSVC workspace: %s\n", filename_sln.c_str()
);
-
ProcessModules();
- m_dswFile = fopen ( filename_dsw.c_str(), "wb" );
- m_slnFile = fopen ( filename_sln.c_str(), "wb" );
+ if (configuration.VSProjectVersion == "6.00") {
+ m_dswFile = fopen ( filename_dsw.c_str(), "wb" );
- if ( !m_dswFile )
- {
- printf ( "Could not create file '%s'.\n",
filename_dsw.c_str() );
- return;
+ if ( !m_dswFile )
+ {
+ printf ( "Could not create file '%s'.\n",
filename_dsw.c_str() );
+ return;
+ }
+ _generate_wine_dsw ( m_dswFile );
+ fclose ( m_dswFile );
}
- _generate_wine_dsw ( m_dswFile );
-
-
- if ( !m_slnFile )
- {
- printf ( "Could not create file '%s'.\n",
filename_sln.c_str() );
- return;
+ else {
+ m_slnFile = fopen ( filename_sln.c_str(), "wb" );
+
+ if ( !m_slnFile )
+ {
+ printf ( "Could not create file '%s'.\n",
filename_sln.c_str() );
+ return;
+ }
+ _generate_sln ( m_slnFile );
+ fclose ( m_slnFile );
}
- _generate_sln ( m_slnFile );
- fclose ( m_dswFile );
- fclose ( m_slnFile );
-
printf ( "Done.\n" );
}