paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-17 23:59:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: fixed overriding build target OS/CPU/LCL, bug #10915

Browse Source 
git-svn-id: trunk@14337 -
This commit is contained in:
mattias 2008-03-01 11:28:43 +00:00
parent 13b1c51267
commit 65a770df87
7 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/opengl/glwin32wglcontext.pas
View File

@ -240,6 +240,7 @@ var
Info: PWGLControlInfo; Info: PWGLControlInfo;
begin begin
Info:=GetWGLControlInfo(Handle); Info:=GetWGLControlInfo(Handle);
// don't use wglSwapLayerBuffers or wglSwapBuffers!
SwapBuffers(Info^.DC); SwapBuffers(Info^.DC);
end; end;

8
examples/openglcontrol/openglcontrol_demo.lpi
View File

@ -25,10 +25,10 @@
</RunParams> </RunParams>
<RequiredPackages Count="2"> <RequiredPackages Count="2">
<Item1> <Item1>
<PackageName Value="LCL"/> <PackageName Value="LazOpenGLContext"/>
</Item1> </Item1>
<Item2> <Item2>
<PackageName Value="LazOpenGLContext"/> <PackageName Value="LCL"/>
</Item2> </Item2>
</RequiredPackages> </RequiredPackages>
<Units Count="2"> <Units Count="2">
@ -46,8 +46,12 @@
</ProjectOptions> </ProjectOptions>
<CompilerOptions> <CompilerOptions>
<Version Value="5"/> <Version Value="5"/>
<SearchPaths>
<LCLWidgetType Value="win32"/>
</SearchPaths>
<CodeGeneration> <CodeGeneration>
<Generate Value="Faster"/> <Generate Value="Faster"/>
<TargetOS Value="win32"/>
</CodeGeneration> </CodeGeneration>
<Other> <Other>
<CompilerPath Value="$(CompPath)"/> <CompilerPath Value="$(CompPath)"/>

3
ide/buildmanager.pas
View File

@ -1207,8 +1207,7 @@ begin
// ' New=',NewTargetCPU,'-',NewTargetOS,'-',NewLCLWidgetType,' FPC=',dbgs(FPCTargetChanged),' LCL=',dbgs(LCLTargetChanged)); // ' New=',NewTargetCPU,'-',NewTargetOS,'-',NewLCLWidgetType,' FPC=',dbgs(FPCTargetChanged),' LCL=',dbgs(LCLTargetChanged));
if LCLTargetChanged then if LCLTargetChanged then
CodeToolBoss.GlobalValues.Variables[ExternalMacroStart+'LCLWidgetType']:= CodeToolBoss.SetGlobalValue(ExternalMacroStart+'LCLWidgetType',NewLCLWidgetType);
NewLCLWidgetType;
if FPCTargetChanged then if FPCTargetChanged then
RescanCompilerDefines(true); RescanCompilerDefines(true);

1
ide/main.pp
View File

@ -6255,6 +6255,7 @@ begin
UpdateCaption; UpdateCaption;
EnvironmentOptions.LastSavedProjectFile:=Project1.ProjectInfoFile; EnvironmentOptions.LastSavedProjectFile:=Project1.ProjectInfoFile;
EnvironmentOptions.Save(false); EnvironmentOptions.Save(false);
MainBuildBoss.SetBuildTarget('','','');
MainBuildBoss.RescanCompilerDefines(true); MainBuildBoss.RescanCompilerDefines(true);
// load required packages // load required packages

8
ide/project.pp
View File

@ -4500,13 +4500,7 @@ var
Changed: Boolean; Changed: Boolean;
begin begin
Changed:=false; Changed:=false;
if CodeToolBoss.SetGlobalValue(ExternalMacroStart+'LCLWidgetType', // the LCLWidgetType, TargetCPU and TargetOS is set by the TBuildManager
Owner.CompilerOptions.GetEffectiveLCLWidgetType)
then begin
//DebugLn('TProjectDefineTemplates.UpdateGlobalValues '
//,' LCLWidgetType="',CodeToolBoss.GlobalValues.Variables[ExternalMacroStart+'LCLWidgetType'],'" Effective="',Owner.CompilerOptions.GetEffectiveLCLWidgetType,'" Options="',Owner.CompilerOptions.LCLWidgetType,'"');
Changed:=true;
end;
if Owner.IsVirtual then if Owner.IsVirtual then
NewProjectDir:=VirtualDirectory NewProjectDir:=VirtualDirectory
else else

2
packager/packagesystem.pas
View File

@ -2573,7 +2573,7 @@ begin
CompilerParams:=APackage.CompilerOptions.MakeOptionsString(Globals, CompilerParams:=APackage.CompilerOptions.MakeOptionsString(Globals,
APackage.CompilerOptions.DefaultMakeOptionsFlags) APackage.CompilerOptions.DefaultMakeOptionsFlags)
+' '+CreateRelativePath(SrcFilename,APackage.Directory); +' '+CreateRelativePath(SrcFilename,APackage.Directory);
//DebugLn(['TLazPackageGraph.CompilePackage SrcFilename="',SrcFilename,'" CompilerFilename="',CompilerFilename,'" CompilerParams="',CompilerParams,'"']); DebugLn(['TLazPackageGraph.CompilePackage SrcFilename="',SrcFilename,'" CompilerFilename="',CompilerFilename,'" CompilerParams="',CompilerParams,'" TargetCPU=',Globals.TargetCPU,' TargetOS=',Globals.TargetOS]);
// check if compilation is needed and if a clean build is needed // check if compilation is needed and if a clean build is needed
Result:=CheckIfPackageNeedsCompilation(APackage, Result:=CheckIfPackageNeedsCompilation(APackage,

1
packager/pkgmanager.pas
View File

@ -3726,6 +3726,7 @@ begin
Result:=CheckPackageGraphForCompilation(nil,FirstAutoInstallDependency, Result:=CheckPackageGraphForCompilation(nil,FirstAutoInstallDependency,
EnvironmentOptions.LazarusDirectory); EnvironmentOptions.LazarusDirectory);
if Result<>mrOk then exit; if Result<>mrOk then exit;
DebugLn(['TPkgManager.DoCompileAutoInstallPackages LCLUnitPath=',PackageGraph.LCLPackage.CompilerOptions.GetUnitPath(true)]);
// save all open files // save all open files
if not (pcfDoNotSaveEditorFiles in Flags) then begin if not (pcfDoNotSaveEditorFiles in Flags) then begin