fix build file naming

diff --git a/.gitignore b/.gitignore
index 6060e87ba0b37aba1809262ae4239f50f3543115..431215462b00e438dd25c244cb204de1b4f47ae4 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ bin
 obj
 *.c8
 *.ch8
+*.sw*

diff --git a/ada_chip.gpr b/ada_chip.gpr
index 63e596862186ff24973a41bd68b4d7db8861633a..8f0a3051e474144b10501ccf8da95d335e846467 100644 (file)
--- a/ada_chip.gpr
+++ b/ada_chip.gpr
@@ -1,14 +1,14 @@
-with "config/adachip_config.gpr";
+with "config/ada_chip_config.gpr";
 project Ada_Chip is
 
    for Source_Dirs use ("src/", "config/");
-   for Object_Dir use "obj/" & Adachip_Config.Build_Profile;
+   for Object_Dir use "obj/" & Ada_Chip_Config.Build_Profile;
    for Create_Missing_Dirs use "True";
    for Exec_Dir use "bin";
    for Main use ("ada_chip.adb");
 
    package Compiler is
-      for Default_Switches ("Ada") use Adachip_Config.Ada_Compiler_Switches;
+      for Default_Switches ("Ada") use Ada_Chip_Config.Ada_Compiler_Switches;
    end Compiler;
 
    package Binder is

diff --git a/config/adachip_config.ads b/config/adachip_config.ads
deleted file mode 100644 (file)
index 1949cad..0000000
--- a/config/adachip_config.ads
+++ /dev/null
@@ -1,20 +0,0 @@
---  Configuration for adachip generated by Alire
-pragma Restrictions (No_Elaboration_Code);
-pragma Style_Checks (Off);
-
-package Adachip_Config is
-   pragma Pure;
-
-   Crate_Version : constant String := "0.1.0-dev";
-   Crate_Name : constant String := "adachip";
-
-   Alire_Host_OS : constant String := "linux";
-
-   Alire_Host_Arch : constant String := "x86_64";
-
-   Alire_Host_Distro : constant String := "debian";
-
-   type Build_Profile_Kind is (release, validation, development);
-   Build_Profile : constant Build_Profile_Kind := development;
-
-end Adachip_Config;

diff --git a/config/adachip_config.gpr b/config/adachip_config.gpr
deleted file mode 100644 (file)
index adaade1..0000000
--- a/config/adachip_config.gpr
+++ /dev/null
@@ -1,52 +0,0 @@
---  Configuration for adachip generated by Alire
-with "asfml.gpr";
-abstract project Adachip_Config is
-   Crate_Version := "0.1.0-dev";
-   Crate_Name := "adachip";
-
-   Alire_Host_OS := "linux";
-
-   Alire_Host_Arch := "x86_64";
-
-   Alire_Host_Distro := "debian";
-   Ada_Compiler_Switches := External_As_List ("ADAFLAGS", " ");
-   Ada_Compiler_Switches := Ada_Compiler_Switches &
-          (
-            "-Og"
-           ,"-gnat2022"
-           ,"-ffunction-sections" -- Separate ELF section for each function
-           ,"-fdata-sections" -- Separate ELF section for each variable
-           ,"-g" -- Generate debug info
-           ,"-gnatwa" -- Enable all warnings
-           ,"-gnatw.X" -- Disable warnings for No_Exception_Propagation
-           ,"-gnatVa" -- All validity checks
-           ,"-gnaty3" -- Specify indentation level of 3
-           ,"-gnatya" -- Check attribute casing
-           ,"-gnatyA" -- Use of array index numbers in array attributes
-           ,"-gnatyB" -- Check Boolean operators
-           ,"-gnatyb" -- Blanks not allowed at statement end
-           ,"-gnatyc" -- Check comments
-           ,"-gnaty-d" -- Disable check no DOS line terminators present
-           ,"-gnatye" -- Check end/exit labels
-           ,"-gnatyf" -- No form feeds or vertical tabs
-           ,"-gnatyh" -- No horizontal tabs
-           ,"-gnatyi" -- Check if-then layout
-           ,"-gnatyI" -- check mode IN keywords
-           ,"-gnatyk" -- Check keyword casing
-           ,"-gnatyl" -- Check layout
-           ,"-gnatym" -- Check maximum line length
-           ,"-gnatyn" -- Check casing of entities in Standard
-           ,"-gnatyO" -- Check that overriding subprograms are explicitly marked as such
-           ,"-gnatyp" -- Check pragma casing
-           ,"-gnatyr" -- Check identifier references casing
-           ,"-gnatyS" -- Check no statements after THEN/ELSE
-           ,"-gnatyt" -- Check token spacing
-           ,"-gnatyu" -- Check unnecessary blank lines
-           ,"-gnatyx" -- Check extra parentheses
-           ,"-gnatW8" -- UTF-8 encoding for wide characters
-          );
-
-   type Build_Profile_Kind is ("release", "validation", "development");
-   Build_Profile : Build_Profile_Kind := "development";
-
-end Adachip_Config;

diff --git a/config/adachip_config.h b/config/adachip_config.h
deleted file mode 100644 (file)
index 1c5495e..0000000
--- a/config/adachip_config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Configuration for adachip generated by Alire */
-#ifndef ADACHIP_CONFIG_H
-#define ADACHIP_CONFIG_H
-
-#define CRATE_VERSION "0.1.0-dev"
-#define CRATE_NAME "adachip"
-
-#define ALIRE_HOST_OS "linux"
-
-#define ALIRE_HOST_ARCH "x86_64"
-
-#define ALIRE_HOST_DISTRO "debian"
-
-#define BUILD_PROFILE_RELEASE 1
-#define BUILD_PROFILE_VALIDATION 2
-#define BUILD_PROFILE_DEVELOPMENT 3
-
-#define BUILD_PROFILE  3
-
-#endif