Browse Source

Introjucer: made it recognise .S files as needing to be compiled.

tags/2021-05-28
jules 12 years ago
parent
commit
7643162766
2 changed files with 5 additions and 5 deletions
  1. +2
    -2
      extras/Introjucer/Source/Application/jucer_CommonHeaders.h
  2. +3
    -3
      extras/Introjucer/Source/Project Saving/jucer_ProjectExporter.cpp

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

@@ -41,9 +41,9 @@ const char* const projectItemDragType = "Project Items";
const char* const drawableItemDragType = "Drawable Items";
const char* const componentItemDragType = "Components";
const char* const sourceFileExtensions = "cpp;mm;m;c;cc;cxx";
const char* const sourceFileExtensions = "cpp;mm;m;c;cc;cxx;s";
const char* const headerFileExtensions = "h;hpp;hxx;hh;inl";
const char* const sourceOrHeaderFileExtensions = "cpp;mm;m;c;cc;cxx;h;hpp;hxx;hh;inl";
const char* const sourceOrHeaderFileExtensions = "cpp;mm;m;c;cc;cxx;h;hpp;hxx;hh;s;inl";
enum ColourIds
{


+ 3
- 3
extras/Introjucer/Source/Project Saving/jucer_ProjectExporter.cpp View File

@@ -140,14 +140,14 @@ bool ProjectExporter::canProjectBeLaunched (Project* project)
}
//==============================================================================
ProjectExporter::ProjectExporter (Project& p, const ValueTree& settings_)
ProjectExporter::ProjectExporter (Project& p, const ValueTree& state)
: xcodeIsBundle (false),
xcodeCreatePList (false),
xcodeCanUseDwarf (true),
makefileIsDLL (false),
msvcIsDLL (false),
msvcIsWindowsSubsystem (true),
settings (settings_),
settings (state),
project (p),
projectType (p.getProjectType()),
projectName (p.getTitle()),
@@ -172,7 +172,7 @@ RelativePath ProjectExporter::rebaseFromProjectFolderToBuildTarget (const Relati
bool ProjectExporter::shouldFileBeCompiledByDefault (const RelativePath& file) const
{
return file.hasFileExtension ("cpp;cc;c;cxx");
return file.hasFileExtension ("cpp;cc;c;cxx;s");
}
void ProjectExporter::createPropertyEditors (PropertyListBuilder& props)


Loading…
Cancel
Save