1 | | Index: Makefile.osx |
2 | | =================================================================== |
3 | | RCS file: /cvsroot/freeimage/FreeImage/Makefile.osx,v |
4 | | retrieving revision 1.9 |
5 | | diff -d -u -r1.9 Makefile.osx |
6 | | --- Makefile.osx 11 Dec 2006 14:30:13 -0000 1.9 |
7 | | +++ Makefile.osx 31 Dec 2006 03:22:16 -0000 |
8 | | @@ -5,23 +5,23 @@ |
9 | | include Makefile.srcs |
10 | | |
11 | | # General configuration variables: |
12 | | -CC_PPC = gcc-3.3 |
13 | | +CC_PPC = gcc-4.0 |
14 | | CC_I386 = gcc-4.0 |
15 | | -CPP_PPC = g++-3.3 |
16 | | +CPP_PPC = g++-4.0 |
17 | | CPP_I386 = g++-4.0 |
18 | | -COMPILERFLAGS = -O3 |
19 | | +COMPILERFLAGS = -Os |
20 | | COMPILERFLAGS_PPC = -arch ppc |
21 | | COMPILERFLAGS_I386 = -arch i386 |
22 | | COMPILERPPFLAGS = -Wno-ctor-dtor-privacy |
23 | | INCLUDE += |
24 | | -INCLUDE_PPC = -nostdinc -isystem /Developer/SDKs/MacOSX10.3.9.sdk/usr/include/gcc/darwin/3.3 -isystem /Developer/SDKs/MacOSX10.3.9.sdk/usr/include -I/Developer/SDKs/MacOSX10.3.9.sdk/usr/include/gcc/darwin/3.3/c++ -I/Developer/SDKs/MacOSX10.3.9.sdk/usr/include/gcc/darwin/3.3/c++/ppc-darwin |
25 | | +INCLUDE_PPC = -isysroot /Developer/SDKs/MacOSX10.3.9.sdk |
26 | | INCLUDE_I386 = -isysroot /Developer/SDKs/MacOSX10.4u.sdk |
27 | | CFLAGS_PPC = $(COMPILERFLAGS) $(COMPILERFLAGS_PPC) $(INCLUDE) $(INCLUDE_PPC) |
28 | | CFLAGS_I386 = $(COMPILERFLAGS) $(COMPILERFLAGS_I386) $(INCLUDE) $(INCLUDE_I386) |
29 | | CPPFLAGS_PPC = $(COMPILERPPFLAGS) $(CFLAGS_PPC) |
30 | | CPPFLAGS_I386 = $(COMPILERPPFLAGS) $(CFLAGS_I386) |
31 | | -LIBRARIES_PPC = -L/Developer/SDKs/MacOSX10.3.9.sdk/usr/lib/gcc/darwin/3.3 -lc -lgcc -lstdc++ |
32 | | -LIBRARIES_I386 = -L/Developer/SDKs/MacOSX10.4u.sdk/usr/lib/gcc/i686-apple-darwin8/4.0.0 -lc -lgcc -lstdc++ |
33 | | +LIBRARIES_PPC = -Wl,-syslibroot /Developer/SDKs/MacOSX10.3.9.sdk |
34 | | +LIBRARIES_I386 = -Wl,-syslibroot /Developer/SDKs/MacOSX10.4u.sdk |
35 | | LIBTOOL = libtool |
36 | | LIPO = lipo |
37 | | |
38 | | @@ -65,10 +65,10 @@ |
39 | | $(LIPO) -create $(SHAREDLIB)-ppc $(SHAREDLIB)-i386 -output $(SHAREDLIB) |
40 | | |
41 | | $(SHAREDLIB)-ppc: $(MODULES_PPC) |
42 | | - $(LIBTOOL) -arch_only ppc -dynamic $(LIBRARIES_PPC) -o $@ $(MODULES_PPC) |
43 | | + $(CPP_PPC) -arch ppc -dynamiclib $(LIBRARIES_PPC) -o $@ $(MODULES_PPC) |
44 | | |
45 | | $(SHAREDLIB)-i386: $(MODULES_I386) |
46 | | - $(CPP_I386) -arch_only i386 -dynamiclib $(LIBRARIES_I386) -o $@ $(MODULES_I386) |
47 | | + $(CPP_I386) -arch i386 -dynamiclib $(LIBRARIES_I386) -o $@ $(MODULES_I386) |
48 | | |
49 | | .c.o-ppc: |
50 | | $(CC_PPC) $(CFLAGS_PPC) -c $< -o $@ |