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

Preliminary support for Objective-C{,++}

Browse Source
This commit is contained in:
Pierre Pronchery 2015-05-07 23:38:11 +02:00
parent 3214ad350b
commit fbf85f198d
3 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/configure.c
View File

@ -109,6 +109,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 },
{ "m", OT_OBJC_SOURCE },
{ "mm", OT_OBJCXX_SOURCE},
{ NULL, 0 } { NULL, 0 }
}; };
const struct ExtensionType * sExtensionType = _sExtensionType; const struct ExtensionType * sExtensionType = _sExtensionType;

8
src/configure.h
View File

@ -103,9 +103,11 @@ extern const String * sTargetType[TT_COUNT];
typedef enum _ObjectType typedef enum _ObjectType
{ {
OT_C_SOURCE = 0, OT_C_SOURCE = 0,
OT_CXX_SOURCE, OT_CXX_SOURCE,
OT_ASM_SOURCE, OT_ASM_SOURCE,
OT_UNKNOWN OT_OBJC_SOURCE,
OT_OBJCXX_SOURCE,
OT_UNKNOWN
} ObjectType; } ObjectType;
# define OT_LAST OT_UNKNOWN # define OT_LAST OT_UNKNOWN
# define OT_COUNT (OT_LAST + 1) # define OT_COUNT (OT_LAST + 1)

15
src/makefile.c
View File

@ -1030,6 +1030,8 @@ static int _objs_source(Prefs * prefs, FILE * fp, String * source,
case OT_ASM_SOURCE: case OT_ASM_SOURCE:
case OT_C_SOURCE: case OT_C_SOURCE:
case OT_CXX_SOURCE: case OT_CXX_SOURCE:
case OT_OBJC_SOURCE:
case OT_OBJCXX_SOURCE:
if(prefs->flags & PREFS_n) if(prefs->flags & PREFS_n)
break; break;
fprintf(fp, " $(OBJDIR)%s%s", source, fprintf(fp, " $(OBJDIR)%s%s", source,
@ -1129,11 +1131,18 @@ static int _target_flags(Configure * configure, FILE * fp,
case OT_ASM_SOURCE: case OT_ASM_SOURCE:
_flags_asm(configure, fp, target); _flags_asm(configure, fp, target);
break; break;
case OT_OBJC_SOURCE:
done[OT_C_SOURCE] = 1;
/* fallback */
case OT_C_SOURCE: case OT_C_SOURCE:
done[OT_OBJC_SOURCE] = 1;
_flags_c(configure, fp, target); _flags_c(configure, fp, target);
break; break;
case OT_CXX_SOURCE: case OT_OBJCXX_SOURCE:
done[OT_CXX_SOURCE] = 1; done[OT_CXX_SOURCE] = 1;
/* fallback */
case OT_CXX_SOURCE:
done[OT_OBJCXX_SOURCE] = 1;
_flags_cxx(configure, fp, target); _flags_cxx(configure, fp, target);
break; break;
case OT_UNKNOWN: case OT_UNKNOWN:
@ -1354,6 +1363,7 @@ static int _target_object(Configure * configure, FILE * fp,
fputc('\n', fp); fputc('\n', fp);
break; break;
case OT_C_SOURCE: case OT_C_SOURCE:
case OT_OBJC_SOURCE:
fprintf(fp, "\n%s%s%s%s\n%s%s", target, "_OBJS = ", fprintf(fp, "\n%s%s%s%s\n%s%s", target, "_OBJS = ",
"$(OBJDIR)", target, target, "_CFLAGS =" "$(OBJDIR)", target, target, "_CFLAGS ="
" $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF)" " $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF)"
@ -1364,6 +1374,7 @@ static int _target_object(Configure * configure, FILE * fp,
fputc('\n', fp); fputc('\n', fp);
break; break;
case OT_CXX_SOURCE: case OT_CXX_SOURCE:
case OT_OBJCXX_SOURCE:
fprintf(fp, "\n%s%s%s%s\n%s%s", target, "_OBJS = ", fprintf(fp, "\n%s%s%s%s\n%s%s", target, "_OBJS = ",
"$(OBJDIR)", target, target, "_CXXFLAGS =" "$(OBJDIR)", target, target, "_CXXFLAGS ="
" $(CPPFLAGSF) $(CPPFLAGS)" " $(CPPFLAGSF) $(CPPFLAGS)"
@ -1593,6 +1604,7 @@ static int _target_source(Configure * configure, FILE * fp,
fputc('\n', fp); fputc('\n', fp);
break; break;
case OT_C_SOURCE: case OT_C_SOURCE:
case OT_OBJC_SOURCE:
if(configure->prefs->flags & PREFS_n) if(configure->prefs->flags & PREFS_n)
break; break;
if(tt == TT_OBJECT) if(tt == TT_OBJECT)
@ -1633,6 +1645,7 @@ static int _target_source(Configure * configure, FILE * fp,
fputc('\n', fp); fputc('\n', fp);
break; break;
case OT_CXX_SOURCE: case OT_CXX_SOURCE:
case OT_OBJCXX_SOURCE:
if(configure->prefs->flags & PREFS_n) if(configure->prefs->flags & PREFS_n)
break; break;
if(tt == TT_OBJECT) if(tt == TT_OBJECT)