DeforaOS/configure
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Introduce a new type for pre-processed assembly files

Browse Source
This commit is contained in:
Pierre Pronchery 2018-03-18 20:36:50 +01:00
parent a6d19ba3b9
commit 525d4ea831
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/configure.c
View File

@ -134,8 +134,8 @@ const struct ExtensionType _sExtensionType[] =
{ "c++", OT_CXX_SOURCE }, { "c++", OT_CXX_SOURCE },
{ "asm", OT_ASM_SOURCE }, { "asm", OT_ASM_SOURCE },
{ "s", OT_ASM_SOURCE }, { "s", OT_ASM_SOURCE },
{ "S", OT_ASM_SOURCE }, { "S", OT_ASMPP_SOURCE },
{ "sx", OT_ASM_SOURCE }, { "sx", OT_ASMPP_SOURCE },
{ "m", OT_OBJC_SOURCE }, { "m", OT_OBJC_SOURCE },
{ "mm", OT_OBJCXX_SOURCE }, { "mm", OT_OBJCXX_SOURCE },
{ "v", OT_VERILOG_SOURCE }, { "v", OT_VERILOG_SOURCE },

1
src/configure.h
View File

@ -99,6 +99,7 @@ typedef enum _ObjectType
OT_C_SOURCE = 0, OT_C_SOURCE = 0,
OT_CXX_SOURCE, OT_CXX_SOURCE,
OT_ASM_SOURCE, OT_ASM_SOURCE,
OT_ASMPP_SOURCE,
OT_OBJC_SOURCE, OT_OBJC_SOURCE,
OT_OBJCXX_SOURCE, OT_OBJCXX_SOURCE,
OT_VERILOG_SOURCE, OT_VERILOG_SOURCE,

4
src/makefile.c
View File

@ -1002,6 +1002,7 @@ static int _objs_source(Makefile * makefile, String * source, TargetType tt)
switch(source_type(extension)) switch(source_type(extension))
{ {
case OT_ASM_SOURCE: case OT_ASM_SOURCE:
case OT_ASMPP_SOURCE:
case OT_C_SOURCE: case OT_C_SOURCE:
case OT_CXX_SOURCE: case OT_CXX_SOURCE:
case OT_OBJC_SOURCE: case OT_OBJC_SOURCE:
@ -1092,6 +1093,7 @@ static int _target_flags(Makefile * makefile, String const * target)
switch(type) switch(type)
{ {
case OT_ASM_SOURCE: case OT_ASM_SOURCE:
case OT_ASMPP_SOURCE:
_flags_asm(makefile, target); _flags_asm(makefile, target);
break; break;
case OT_OBJC_SOURCE: case OT_OBJC_SOURCE:
@ -1379,6 +1381,7 @@ static int _target_object(Makefile * makefile,
switch(source_type(extension)) switch(source_type(extension))
{ {
case OT_ASM_SOURCE: case OT_ASM_SOURCE:
case OT_ASMPP_SOURCE:
_makefile_print(makefile, "\n%s%s%s%s\n%s%s", _makefile_print(makefile, "\n%s%s%s%s\n%s%s",
target, "_OBJS = ", "$(OBJDIR)", target, target, "_OBJS = ", "$(OBJDIR)", target,
target, "_ASFLAGS =" target, "_ASFLAGS ="
@ -1663,6 +1666,7 @@ static int _target_source(Makefile * makefile,
switch((ot = source_type(extension))) switch((ot = source_type(extension)))
{ {
case OT_ASM_SOURCE: case OT_ASM_SOURCE:
case OT_ASMPP_SOURCE:
if(tt == TT_OBJECT) if(tt == TT_OBJECT)
_makefile_print(makefile, "%s%s", "\n$(OBJDIR)", _makefile_print(makefile, "%s%s", "\n$(OBJDIR)",
target); target);