Skip to content

Commit

Permalink
CREATE_TOOL: Renames static libraries used for iOS target
Browse files Browse the repository at this point in the history
  • Loading branch information
Vincent Bénony committed Jan 11, 2016
1 parent 440cc50 commit a6fe4d2
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions devtools/create_project/xcode.cpp
View file
Expand Up @@ -467,14 +467,15 @@ void XcodeProvider::setupFrameworksBuildPhase(const BuildSetup &setup) {
absoluteOutputDir = "lib";
#endif

DEF_LOCALLIB_STATIC_PATH(absoluteOutputDir + "/libFLACiOS.a", "libFLACiOS", true);
DEF_LOCALLIB_STATIC_PATH(absoluteOutputDir + "/libFreetype2.a", "libFreetype2", true);
DEF_LOCALLIB_STATIC_PATH(absoluteOutputDir + "/libFLAC.a", "libFLAC", true);
DEF_LOCALLIB_STATIC_PATH(absoluteOutputDir + "/libfreetype.a", "libfreetype", true);
DEF_LOCALLIB_STATIC_PATH(absoluteOutputDir + "/libogg.a", "libogg", true);
DEF_LOCALLIB_STATIC_PATH(absoluteOutputDir + "/libpng.a", "libpng", true);
DEF_LOCALLIB_STATIC_PATH(absoluteOutputDir + "/libvorbis.a", "libvorbis", true);
DEF_LOCALLIB_STATIC_PATH(absoluteOutputDir + "/libmad.a", "libmad", true);
DEF_LOCALLIB_STATIC_PATH(absoluteOutputDir + "/libfluidsynth.a", "libfluidsynth", true);
DEF_LOCALLIB_STATIC_PATH(absoluteOutputDir + "/libglib.a", "libglib", true);
DEF_LOCALLIB_STATIC_PATH(absoluteOutputDir + "/libglib.a", "libglib", true);
DEF_LOCALLIB_STATIC_PATH(absoluteOutputDir + "/libffi.a", "libffi", true);

This comment has been minimized.

Sign in to view

Copy link
@lordhoto

lordhoto Jan 11, 2016

Contributor

Tabs instead of spaces for indentation :-)

frameworksGroup->_properties["children"] = children;
_groups.add(frameworksGroup);
Expand Down Expand Up @@ -508,10 +509,10 @@ void XcodeProvider::setupFrameworksBuildPhase(const BuildSetup &setup) {
frameworks_iOS.push_back("OpenGLES.framework");

if (CONTAINS_DEFINE(setup.defines, "USE_FLAC")) {
frameworks_iOS.push_back("libFLACiOS.a");
frameworks_iOS.push_back("libFLAC.a");
}
if (CONTAINS_DEFINE(setup.defines, "USE_FREETYPE2")) {
frameworks_iOS.push_back("libFreetype2.a");
frameworks_iOS.push_back("libfreetype.a");
}
if (CONTAINS_DEFINE(setup.defines, "USE_PNG")) {
frameworks_iOS.push_back("libpng.a");
Expand All @@ -525,7 +526,8 @@ void XcodeProvider::setupFrameworksBuildPhase(const BuildSetup &setup) {
}
if (CONTAINS_DEFINE(setup.defines, "USE_FLUIDSYNTH")) {
frameworks_iOS.push_back("libfluidsynth.a");
frameworks_iOS.push_back("libglib.a");
frameworks_iOS.push_back("libglib.a");
frameworks_iOS.push_back("libffi.a");

This comment has been minimized.

Sign in to view

Copy link
@lordhoto

lordhoto Jan 11, 2016

Contributor

Here tabs should be used too.
frameworks_iOS.push_back("CoreMIDI.framework");
frameworks_iOS.push_back("libiconv.tbd");
}
Expand Down

3 comments on commit a6fe4d2

@bSr43
Copy link

@bSr43 bSr43 commented on a6fe4d2 Jan 11, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Feeling so stupid… just after I launched the push, I saw those spaces :'( so sorry…

@bluegr
Copy link
Member

@bluegr bluegr commented on a6fe4d2 Jan 11, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey, don't worry :) Just change the settings in your IDE to use tabs

@bSr43
Copy link

@bSr43 bSr43 commented on a6fe4d2 Jan 11, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's because I'm using the same IDE for different projects with different settings :) Anyway, that's not an excuse, I'll take care of the IDE settings next time, I promise :)

Please sign in to comment.