Skip to content

Commit

Permalink
Fix building crate orka_awt
Browse files Browse the repository at this point in the history
Signed-off-by: onox <denkpadje@gmail.com>
  • Loading branch information
onox committed Feb 14, 2023
1 parent 952e9a6 commit b455160
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 33 deletions.
2 changes: 1 addition & 1 deletion orka_awt/alire.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ linux = true
'...' = false

[project-files.'case(os)']
linux = ["awt-linux.gpr", "example/example.gpr"]
linux = ["orka_awt-linux.gpr", "example/example.gpr"]

[[depends-on]]
[depends-on.'case(os)'.linux]
Expand Down
18 changes: 0 additions & 18 deletions orka_awt/awt-linux.gpr

This file was deleted.

12 changes: 6 additions & 6 deletions orka_awt/example/example.gpr
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
with "awt-linux";
with "awt";
with "../config/awt_config";
with "orka_awt-linux";
with "orka_awt";
with "../config/orka_awt_config";

project Example is

for Languages use ("Ada");

for Create_Missing_Dirs use "True";

for Object_Dir use "build/example/obj/" & Awt_Config.Build_Profile;
for Object_Dir use "build/example/obj/" & Orka_Awt_Config.Build_Profile;
for Exec_Dir use "build/bin";

for Source_Dirs use ("src");

for Main use ("example.adb");

package Compiler renames AWT.Compiler;
package Binder renames AWT.Binder;
package Compiler renames Orka_AWT.Compiler;
package Binder renames Orka_AWT.Binder;

end Example;
18 changes: 18 additions & 0 deletions orka_awt/orka_awt-linux.gpr
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
with "orka_awt";
with "config/orka_awt_config";

project Orka_Awt.Linux is

for Source_Dirs use ("src/wayland", "src/wayland/linux", "src/shared");

for Object_Dir use "build/linux/obj/" & Orka_Awt_Config.Build_Profile;
for Library_Dir use "build/linux/lib";

package Compiler renames Orka_Awt.Compiler;
package Binder renames Orka_Awt.Binder;

package Install is
for Artifacts (".") use ("data");
end Install;

end Orka_Awt.Linux;
16 changes: 8 additions & 8 deletions orka_awt/awt.gpr → orka_awt/orka_awt.gpr
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
with "config/awt_config";
with "config/orka_awt_config";

project Awt is
project Orka_Awt is

for Library_Name use "awt";
for Library_Version use Project'Library_Name & ".so." & Awt_Config.Crate_Version;
for Library_Name use "orka-awt";
for Library_Version use Project'Library_Name & ".so." & Orka_Awt_Config.Crate_Version;

for Create_Missing_Dirs use "True";

for Source_Dirs use ("src");

for Object_Dir use "build/obj/" & Awt_Config.Build_Profile;
for Object_Dir use "build/obj/" & Orka_Awt_Config.Build_Profile;
for Library_Dir use "build/lib";

type Library_Type_Type is ("relocatable", "static", "static-pic");
Library_Type : Library_Type_Type :=
external ("AWT_LIBRARY_TYPE", external ("LIBRARY_TYPE", "static"));
external ("ORKA_AWT_LIBRARY_TYPE", external ("LIBRARY_TYPE", "static"));
for Library_Kind use Library_Type;

Switches := ("-mavx");

package Compiler is
for Default_Switches ("Ada") use Awt_Config.Ada_Compiler_Switches & Switches;
for Default_Switches ("Ada") use Orka_Awt_Config.Ada_Compiler_Switches & Switches;
for Local_Configuration_Pragmas use "gnat.adc";
end Compiler;

package Binder is
for Switches ("Ada") use ("-Es"); -- Symbolic traceback
end Binder;

end Awt;
end Orka_Awt;

0 comments on commit b455160

Please sign in to comment.