Browse Source

Introjucer: Added .S to the supported asm file extensions.

tags/2021-05-28
jules 10 years ago
parent
commit
970300867f
3 changed files with 6 additions and 5 deletions
  1. +3
    -3
      extras/Introjucer/Source/Application/jucer_CommonHeaders.h
  2. +2
    -2
      extras/Introjucer/Source/Project Saving/jucer_ProjectExport_Make.h
  3. +1
    -0
      extras/Introjucer/Source/Project Saving/jucer_ProjectExport_XCode.h

+ 3
- 3
extras/Introjucer/Source/Application/jucer_CommonHeaders.h View File

@@ -46,9 +46,9 @@ const char* const headerFileExtensions = "h;hpp;hxx;hh;inl";
const char* const cOrCppFileExtensions = "cpp;cc;cxx;c";
const char* const cppFileExtensions = "cpp;cc;cxx";
const char* const objCFileExtensions = "mm;m";
const char* const asmFileExtensions = "s;asm";
const char* const sourceOrHeaderFileExtensions = "cpp;mm;m;c;cc;cxx;s;asm;h;hpp;hxx;hh;inl";
const char* const fileTypesToCompileByDefault = "cpp;mm;c;m;cc;cxx;s;asm;r";
const char* const asmFileExtensions = "s;S;asm";
const char* const sourceOrHeaderFileExtensions = "cpp;mm;m;c;cc;cxx;s;S;asm;h;hpp;hxx;hh;inl";
const char* const fileTypesToCompileByDefault = "cpp;mm;c;m;cc;cxx;s;S;asm;r";
enum ColourIds
{


+ 2
- 2
extras/Introjucer/Source/Project Saving/jucer_ProjectExport_Make.h View File

@@ -311,8 +311,8 @@ private:
<< ": " << escapeSpaces (files.getReference(i).toUnixStyle()) << newLine
<< "\t-@mkdir -p $(OBJDIR)" << newLine
<< "\t@echo \"Compiling " << files.getReference(i).getFileName() << "\"" << newLine
<< (files.getReference(i).hasFileExtension (".c") ? "\t@$(CC) $(CFLAGS) -o \"$@\" -c \"$<\""
: "\t@$(CXX) $(CXXFLAGS) -o \"$@\" -c \"$<\"")
<< (files.getReference(i).hasFileExtension ("c;s;S") ? "\t@$(CC) $(CFLAGS) -o \"$@\" -c \"$<\""
: "\t@$(CXX) $(CXXFLAGS) -o \"$@\" -c \"$<\"")
<< newLine << newLine;
}
}


+ 1
- 0
extras/Introjucer/Source/Project Saving/jucer_ProjectExport_XCode.h View File

@@ -990,6 +990,7 @@ private:
if (file.hasFileExtension (".m")) return "sourcecode.c.objc";
if (file.hasFileExtension (".c")) return "sourcecode.c.c";
if (file.hasFileExtension (headerFileExtensions)) return "sourcecode.c.h";
if (file.hasFileExtension (asmFileExtensions)) return "sourcecode.c.asm";
if (file.hasFileExtension (".framework")) return "wrapper.framework";
if (file.hasFileExtension (".jpeg;.jpg")) return "image.jpeg";
if (file.hasFileExtension ("png;gif")) return "image" + file.getFileExtension();


Loading…
Cancel
Save