Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-04 08:15:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

prepare for screensaver : Adding win32scr as target it genrate a .scr file instead for a win32gui

Browse source 
svn path=/trunk/; revision=21624
This commit is contained in:
Magnus Olsen 2006-04-17 10:08:35 +00:00
parent 8c37aa119a
commit 47ff3fad63
8 changed files with 415 additions and 567 deletions
Download patch file Download diff file Expand all files Collapse all files

1
reactos/tools/rbuild/backend/mingw/modulehandler.cpp
View file

@ -209,6 +209,7 @@ MingwModuleHandler::InstanciateHandler (
case Win32CUI:
handler = new MingwWin32CUIModuleHandler ( module );
break;
case Win32SCR:
case Win32GUI:
handler = new MingwWin32GUIModuleHandler ( module );
break;

2
reactos/tools/rbuild/backend/msvc/msvcmaker.cpp
View file

@ -59,7 +59,7 @@ MSVCBackend::_generate_dsp ( const Module& module )
string module_type = GetExtension(module.GetTargetName());
bool lib = (module_type == ".lib") || (module_type == ".a");
bool dll = (module_type == ".dll") || (module_type == ".cpl");
bool exe = (module_type == ".exe");
bool exe = (module_type == ".exe") || (module_type == ".scr");
// TODO FIXME - need more checks here for 'sys' and possibly 'drv'?
bool console = exe && (module.type == Win32CUI);

4
reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp
View file

@ -54,7 +54,7 @@ MSVCBackend::_generate_vcproj ( const Module& module )
string module_type = GetExtension(module.GetTargetName());
bool lib = (module.type == ObjectLibrary) || (module_type == ".lib") || (module_type == ".a");
bool dll = (module_type == ".dll") || (module_type == ".cpl");
bool exe = (module_type == ".exe");
bool exe = (module_type == ".exe") || (module_type == ".scr");
bool sys = (module_type == ".sys");
string path_basedir = module.GetPathToBaseDir ();
@ -428,7 +428,7 @@ MSVCBackend::_generate_vcproj ( const Module& module )
fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"NtProcessStartup\"\r\n" );
fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", baseaddr.c_str ());
}
else if ( module.type == Win32CUI || module.type == Win32GUI )
else if ( module.type == Win32CUI || module.type == Win32GUI || module.type == Win32SCR)
{
fprintf ( OUT, "\t\t\t\tSubSystem=\"%d\"\r\n", console ? 1 : 2 );
}

1
reactos/tools/rbuild/bootstrap.cpp
View file

@ -47,6 +47,7 @@ Bootstrap::IsSupportedModuleType ( ModuleType type )
case NativeCUI:
case Win32DLL:
case Win32CUI:
case Win32SCR:
case Win32GUI:
case KernelModeDriver:
case BootSector:

10
reactos/tools/rbuild/module.cpp
View file

@ -743,6 +743,8 @@ Module::GetModuleType ( const string& location, const XMLAttribute& attribute )
return Win32CUI;
if ( attribute.value == "win32gui" )
return Win32GUI;
if ( attribute.value == "win32scr" )
return Win32SCR;
if ( attribute.value == "bootloader" )
return BootLoader;
if ( attribute.value == "bootsector" )
@ -782,6 +784,9 @@ Module::GetDefaultModuleExtension () const
case Win32CUI:
case Win32GUI:
return ".exe";
case Win32SCR:
return ".scr";
case KernelModeDLL:
case NativeDLL:
case Win32DLL:
@ -830,6 +835,7 @@ Module::GetDefaultModuleEntrypoint () const
return "_wmainCRTStartup";
else
return "_mainCRTStartup";
case Win32SCR:
case Win32GUI:
if ( isUnicode )
return "_wWinMainCRTStartup";
@ -868,6 +874,7 @@ Module::GetDefaultModuleBaseaddress () const
case Win32CUI:
case Test:
return "0x00400000";
case Win32SCR:
case Win32GUI:
return "0x00400000";
case KernelModeDLL:
@ -910,6 +917,7 @@ Module::IsDLL () const
case NativeCUI:
case Win32CUI:
case Test:
case Win32SCR:
case Win32GUI:
case BuildTool:
case StaticLibrary:
@ -941,6 +949,7 @@ Module::GenerateInOutputTree () const
case NativeCUI:
case Win32CUI:
case Test:
case Win32SCR:
case Win32GUI:
case BuildTool:
case BootLoader:
@ -1392,6 +1401,7 @@ AutoRegister::IsSupportedModuleType ( ModuleType type )
case NativeCUI:
case Win32CUI:
case Win32GUI:
case Win32SCR:
case KernelModeDriver:
case BootSector:
case BootLoader:

3
reactos/tools/rbuild/rbuild.h
View file

@ -263,7 +263,8 @@ enum ModuleType
RpcServer = 16,
RpcClient = 17,
Alias = 18,
BootProgram = 19
BootProgram = 19,
Win32SCR = 20
};
enum HostType

29
reactos/tools/rbuild/rbuild.sln
View file

@ -1,20 +1,21 @@

Microsoft Visual Studio Solution File, Format Version 9.00
# Visual C++ Express 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rbuild", "rbuild.vcproj", "{F45FB5E6-F7C9-4071-B0C4-681FCA8E53E7}"
Microsoft Visual Studio Solution File, Format Version 8.00
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rbuild", "rbuild.vcproj", "{D9305AFB-499E-49F1-A865-99DD7E19E762}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
GlobalSection(SolutionConfiguration) = preSolution
Debug = Debug
Release = Release
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{F45FB5E6-F7C9-4071-B0C4-681FCA8E53E7}.Debug|Win32.ActiveCfg = Debug|Win32
{F45FB5E6-F7C9-4071-B0C4-681FCA8E53E7}.Debug|Win32.Build.0 = Debug|Win32
{F45FB5E6-F7C9-4071-B0C4-681FCA8E53E7}.Release|Win32.ActiveCfg = Release|Win32
{F45FB5E6-F7C9-4071-B0C4-681FCA8E53E7}.Release|Win32.Build.0 = Release|Win32
GlobalSection(ProjectConfiguration) = postSolution
{D9305AFB-499E-49F1-A865-99DD7E19E762}.Debug.ActiveCfg = Debug|Win32
{D9305AFB-499E-49F1-A865-99DD7E19E762}.Debug.Build.0 = Debug|Win32
{D9305AFB-499E-49F1-A865-99DD7E19E762}.Release.ActiveCfg = Release|Win32
{D9305AFB-499E-49F1-A865-99DD7E19E762}.Release.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
GlobalSection(ExtensibilityGlobals) = postSolution
EndGlobalSection
GlobalSection(ExtensibilityAddIns) = postSolution
EndGlobalSection
EndGlobal

932
reactos/tools/rbuild/rbuild.vcproj
View file

File diff suppressed because it is too large Load diff