Feature makefile refactoring + osx working (almost)

[arturoc]

this moves the common parts of the different linux config.make files to a common file. probably needs a different organization but by now we have the the common parts identified

also osx is working, but still needs the bundle creation phase or at least use install-name-tool to tell the exe where the dynamic library for fmod is

[arturoc]

btw, i've only tested with xcode 3, so sdk 10.6 but should work with other sdk's too

[bakercp]

Exciting. I'll test it out.

[arturoc]

with that last commit the executable works, still no bundle but i think it's just a matter of creating a plist and moving the executable and libraries into an folder with the name of the project + .app

i've added an afterplatform step in the osx config, the bundle creation should go there

[bilderbuchi]

are those all those additions in export/osx/Frameworks/GLUT.framework/ intended, or did something slip in sideways?

[arturoc]

@bilderbuchi yes that's correct

btw, don't merge this yet, there's a problem with the dependencies on the OF project i'm correcting it + adding android support

[thiagohersan]

The problem I see with xcode-select is that for some (older ?) installs the xcode tool location and sdks are separate.

I believe that in those installs the xcode-select -print-path command will return something like:
/Developer/Applications/Xcode.app/Contents

while the SDKs are in:
/Developer/SDKs

I think the original way might be the best way for now.

I'll PR something...

[arturoc]

ive tried with xcodebuild but it doesn't work on xcode 3. with xcode-select both in xcode3 and an old xcode4 i got

/Developer

i'll fix the conditional tomorrow

[arturoc]

hey, i'm going to merge this, i've been working with this makefiles for a while (including osx and android) and it works great.

so i'm going to merge them here and then move the corresponding files to develop, we'll loose the history by now, but will be there once we merge the whole branch.

anyway, just in case anyone wanted to add something before merging

[bilderbuchi]

Nothing comes to my mind. Great work Arturo!
you don't have to lose the commit logs (if you mean that by history) - you can cherry-pick all the commits in your branch over to develop. Something like this should do the trick (Untested!):

git checkout develop (meaning OF-develop)
git cherry-pick develop-raspberrypi...feature-makefiles

mind the 3 dots! this needs git >= 1.7.1. commits will have new SHAs (of course) but commit changesets and their messages will be preserved.

[arturoc]

mmh, not sure that will work since the raspberry branch already has
changes to the makefiles will try though but i think the easiest is to
just copy the files by now and then get the whole history when we merge
the raspi branch into develop

On 01/31/2013 05:35 PM, Christoph Buchner wrote:

Nothing comes to my mind. Great work Arturo!
you don't have to lose the commit logs (if you mean that by history) -
you can cherry-pick all the commits in your branch over to develop.
Something like this should do the trick (Untested!):

|git checkout develop (meaning OF-develop)
git cherry-pick develop-raspberrypi...feature-makefiles
|

mind the 3 dots! this needs git >= 1.7.1. commits will have new SHAs (of
course) but commit changesets and their messages will be preserved.

—
Reply to this email directly or view it on GitHub
#116 (comment).

[bilderbuchi]

hm in that case you're probably right. you just have to pay attention when moving the files, to not get merge conflicts when you then merge the raspi branch later.

[bakercp]

Merging into the main repo is great. I'd say go for it, especially if you can preserve the history. It's good for all of our github cred!

[arturoc]

i can't keep the history right now as there's too many commits but every commit will be there once we merge the raspberry branch into the main OF repo.

[bakercp]

go for it!

[danzeeeman]

@Arturo wait are you gonna merge the pi branch into the main repo?

On Thu, Jan 31, 2013 at 1:50 PM, Christopher Baker <notifications@github.com

wrote:

go for it!

—
Reply to this email directly or view it on GitHubhttps://github.com//pull/116#issuecomment-12958951.

"I believe in science. Unlike mathematical theorems, scientific results
can't be proved. They can only be tested again and again, until only a fool
would not believe them.

I cannot prove that electrons exist, but I believe fervently in their
existence. And if you don't believe in them, I have a high voltage cattle
prod I'm willing to apply as an argument on their behalf. Electrons speak
for themselves."

-- Seth Lloyd: Quantum Mechanical Engineer, MIT

/.

[bilderbuchi]

no, just this branch (arturoc:feature-makefiles), which has the new makefile system, afaik.

[bakercp]

Very exciting. Thanks for all of the polishing and refactoring on this @arturoc. It's looking beautiful!