Skip to content

Commit

Permalink
Introduced support for PPC arch on Mac OS X.
Browse files Browse the repository at this point in the history
Signed-off-by: Denis Loginov <dloginov@mit.edu>
  • Loading branch information
Denis Loginov committed Sep 23, 2011
1 parent 84654cc commit 99ba491
Show file tree
Hide file tree
Showing 6 changed files with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion goldendict.pro
Expand Up @@ -89,7 +89,8 @@ unix:!mac {
INSTALLS += desktops2
}
mac {
CONFIG += x86 x86_64
# Uncomment this line to make a universal binary for Mac OS X >= 10.4
# CONFIG += x86 x86_64 ppc
LIBS = -lz \
-liconv \
-lvorbisfile \
Expand Down
Binary file modified maclibs/lib/libhunspell-1.2.dylib
Binary file not shown.
Binary file modified maclibs/lib/libiconv.dylib
Binary file not shown.
Binary file modified maclibs/lib/libogg.dylib
Binary file not shown.
Binary file modified maclibs/lib/libvorbis.dylib
Binary file not shown.
Binary file modified maclibs/lib/libvorbisfile.dylib
Binary file not shown.

7 comments on commit 99ba491

@chulai
Copy link

@chulai chulai commented on 99ba491 Sep 23, 2011

Choose a reason for hiding this comment

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

Is there any reason why we don't want to leave that line uncommented by default?
What happens now with that line commented?
Is PPC 64-bit supported?

@dinvlad
Copy link
Owner

Choose a reason for hiding this comment

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

We can build universal binary for PPC-32 and Intel-32/64 simultaneously, but only with Xcode 2 (or better 3) and not 4, because the latter dropped support for PPC altogether. So, people would wonder why the project fails to build out of the box.
Also, even with proper Xcode you still need a custom-built Qt SDK (for all 3 architectures), which is not available from Nokia website. I have indeed built Qt from their open source package for all the arches, but it takes about a day and needs some further instructions.
So, let's leave it commented so people interested in just keeping up with Git version of Goldendict may still use it readily without any modifications (hence be able to build either for Carbon PPC-32/Intel-32 with Qt 4.6 for OS X 10.4/10.5, or Cocoa Intel-32/64 with 4.7 for OS X 10.5 - 10.7), and those ones who are into building the "universal" universal binary may take additional steps above to ensure the stuff will work for them.
I can approve it does build if you use Xcode 3 and custom-built Qt 4.7 (Carbon PPC-32 + Carbon Intel-32 + Cocoa Intel-64), which was done on 10.6 and is supposed to work on 10.4+.
Xcode 3 cannot be easily installed on Lion (10.7) anymore, though.
However, the PPC-32/Intel-32 binary built with Xcode 3 and Qt 4.6 on 10.6 should work on any arch and 10.4+.

@chulai
Copy link

@chulai chulai commented on 99ba491 Sep 23, 2011

Choose a reason for hiding this comment

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

Ok, all that said, can we readd the line CONFIG += x86 x86_64
like it was before? And add a comment line explaining that if the user switches the CONFIG line to the one that adds PPC he/she will need such xcode and QT versions for the universal binary?

@chulai
Copy link

@chulai chulai commented on 99ba491 Sep 23, 2011

Choose a reason for hiding this comment

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

What I was trying to say before is something like this:

Uncomment this line to make a universal binary for Mac OS X >= 10.6 (and also list the supported architectures and which UI toolkit is built for: Cocoa or Carbon)

CONFIG += x86 x86_64

Uncomment this line to make a universal binary for Mac OS X >= 10.4 (and also list the supported architectures and which UI toolkit is built for: Cocoa or Carbon)

CONFIG += x86 x86_64 ppc

makes sense?

@dinvlad
Copy link
Owner

Choose a reason for hiding this comment

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

Sure.
6140ff5

@dinvlad
Copy link
Owner

Choose a reason for hiding this comment

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

Actually, no!
CONFIG += x86 x86_64 doesn't work if you just use the mainstream 64-bit distribution of Qt SDK, as it doesn't contain even i386 libs anymore.
So let's stick to what I've submitted previously.

@chulai
Copy link

@chulai chulai commented on 99ba491 Sep 24, 2011

Choose a reason for hiding this comment

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

ok, got it.

Please sign in to comment.