Allegro.cc - Online Community

Allegro.cc Forums » Allegro Development » Allegro 4.2.1 compiler test

This thread is locked; no one can reply to it. rss feed Print
 1   2   3 
Allegro 4.2.1 compiler test
Evert
Member #794
November 2000
avatar

I already posted this on the mailinglist, but it can't hurt to post it again here.
Allegro 4.2.1 is ready, but I want to stress-test the release before putting it up for public download. In particular, I'd like people to try to compile the source code (the more platforms the better) and report problems (if any). Tests with binary compatibility would also be useful.

You can grab a pre-release copy of the archives from http://www.eglebbk.dds.nl/allegro/.

Just in case there is any doubt, if your compiler is setup properly and more is required than
fix.sh $platform
./configure
make
for UNIX systems, or
fix.sh $platform
make
for DOS/Windows/MacOS X, that indicates a problem with the release.

Thanks.

HoHo
Member #4,534
April 2004
avatar

gcc version 4.1.1 (Gentoo 4.1.1)

 Some drivers will be built as dynamic modules.
 Enabled modules: dga2 jackdigi fbcon vga ossmidi artsdigi esddigi alsamidi alsadigi ossdigi
 Disabled modules: svgalib vbeaf sgialdigi
 Generated code: multithreaded, little endian, i386 asm, MMX, SSE
 Generated libraries: shared release
 Compiled programs: dynamically linked release
 Ignoring compiler warnings.
 X11 support: enabled with: Xext Xpm Xcursor XShm XF86VidMode XDGA XIM
 Linux console support: enabled

Compilation went fine without errors or warnings. At least I didn't see any warnings.

Quote:

Tests with binary compatibility would also be useful.

What do you mean by that? Should I try to run allegro 4.2.0 programs using 4.2.1 .so's?

__________
In theory, there is no difference between theory and practice. But, in practice, there is - Jan L.A. van de Snepscheut
MMORPG's...Many Men Online Role Playing Girls - Radagar
"Is Java REALLY slower? Does STL really bloat your exes? Find out with your friendly host, HoHo, and his benchmarking machine!" - Jakub Wasilewski

Evert
Member #794
November 2000
avatar

Quote:

What do you mean by that? Should I try to run allegro 4.2.0 programs using 4.2.1 .so's?

Yes. It should work, but best to check. :)

Richard Phipps
Member #1,632
November 2001
avatar

HoHo
Member #4,534
April 2004
avatar

Quote:

Yes. It should work, but best to check. :)

OK I'll test it when I get home. I should not actually play around with allegro at work :P

__________
In theory, there is no difference between theory and practice. But, in practice, there is - Jan L.A. van de Snepscheut
MMORPG's...Many Men Online Role Playing Girls - Radagar
"Is Java REALLY slower? Does STL really bloat your exes? Find out with your friendly host, HoHo, and his benchmarking machine!" - Jakub Wasilewski

ReyBrujo
Moderator
January 2001
avatar

I did a ./configure --enable-dbglib=yes --enable-proflib=yes --enable-static=yes --enable-staticprog=yes, make and compiled for a while. However, it stopped with a

Quote:

echo ought to run makeinfo --no-split -o docs/info/allegro.info docs/texi/allegro.texi
ought to run makeinfo --no-split -o docs/info/allegro.info docs/texi/allegro.texi

Need to install it, but it seems it compiled everything without problem with Ubuntu (gcc 4.0.3)

--
RB
光子「あたしただ…奪う側に回ろうと思っただけよ」
Mitsuko's last words, Battle Royale

GullRaDriel
Member #3,861
September 2003
avatar

In case you wanna know the error on a Window$ Xp Pro system, when launching any of the examples with the previous alleg42.dll, it crash saying that:

{"name":"590080","src":"\/\/djungxnpq2nug.cloudfront.net\/image\/cache\/a\/0\/a0166b862a39f18459e460e4bc1d49e5.jpg","w":710,"h":119,"tn":"\/\/djungxnpq2nug.cloudfront.net\/image\/cache\/a\/0\/a0166b862a39f18459e460e4bc1d49e5"}590080

Other than that, everything is working fine when using the new dll (just copied it from lib/mingw32 to examples/)

1Computer: AMD athlon 64 3400 + , Geforce FX 5700
2 
3Reading specs from c:/Codeblocks/bin/../lib/gcc/mingw32/3.4.4/specs
4Configured with: ../gcc/configure --with-gcc --with-gnu-ld --with-gnu-as --host=mingw32 --target=mingw32 --prefix=/mingw --enable-threads --disable-nls --enable-languages=c,c++,f77,ada,objc,java --dis
5able-win32-registry --disable-shared --enable-sjlj-exceptions --enable-libgcj --disable-java-awt --without-x --enable-java-gc=boehm --disable-libgcj-debug --enable-interpreter --enable-hash-synchroniz
6ation --enable-libstdcxx-debug
7Thread model: win32
8gcc version 3.4.4 (mingw special)
9 
10gcc -DALLEGRO_SRC -DALLEGRO_LIB_BUILD -Wall -Wno-unused -mtune=i586 -O2 -funroll-loops -ffast-math -fomit-frame-pointer -I. -I./include -o obj/mingw32/alleg/wddaccel.o -c src/win/wddaccel.c
11In file included from src/win/wddaccel.c:25:
12src/win/wddraw.h:33:22: ddraw.h: No such file or directory
13In file included from src/win/wddaccel.c:25:
14src/win/wddraw.h:43: error: syntax error before "LPDIRECTDRAWSURFACE2"
15src/win/wddraw.h:43: warning: no semicolon at end of struct or union
16src/win/wddraw.h:49: error: syntax error before '}' token
17src/win/wddraw.h:49: warning: type defaults to `int' in declaration of `DDRAW_SURFACE'
18src/win/wddraw.h:49: warning: data definition has no type or storage class
19src/win/wddraw.h:63: error: syntax error before "directdraw"
20src/win/wddraw.h:63: warning: type defaults to `int' in declaration of `directdraw'
21src/win/wddraw.h:63: warning: data definition has no type or storage class
22src/win/wddraw.h:64: error: syntax error before "ddclipper"
23src/win/wddraw.h:64: warning: type defaults to `int' in declaration of `ddclipper'
24src/win/wddraw.h:64: warning: data definition has no type or storage class
25src/win/wddraw.h:65: error: syntax error before "ddpalette"
26src/win/wddraw.h:65: warning: type defaults to `int' in declaration of `ddpalette'
27src/win/wddraw.h:65: warning: data definition has no type or storage class
28src/win/wddraw.h:66: error: syntax error before "ddpixel_format"
29src/win/wddraw.h:66: warning: type defaults to `int' in declaration of `ddpixel_format'
30src/win/wddraw.h:66: warning: data definition has no type or storage class
31src/win/wddraw.h:67: error: syntax error before "ddcaps"
32src/win/wddraw.h:67: warning: type defaults to `int' in declaration of `ddcaps'
33src/win/wddraw.h:67: warning: data definition has no type or storage class
34src/win/wddraw.h:69: error: syntax error before '*' token
35src/win/wddraw.h:69: warning: type defaults to `int' in declaration of `gfx_directx_primary_surface'
36src/win/wddraw.h:69: warning: data definition has no type or storage class
37src/win/wddraw.h:98: error: syntax error before '*' token
38src/win/wddraw.h:115: error: syntax error before '*' token
39src/win/wddraw.h:134: error: syntax error before '*' token
40src/win/wddraw.h:134: error: syntax error before "LPDDPIXELFORMAT"
41src/win/wddraw.h:134: warning: type defaults to `int' in declaration of `gfx_directx_create_surface'
42src/win/wddraw.h:134: warning: data definition has no type or storage class
43src/win/wddraw.h:135: error: syntax error before '*' token
44src/win/wddraw.h:136: error: syntax error before '*' token
45src/win/wddraw.h:140: error: syntax error before '*' token
46src/win/wddraw.h:141: error: syntax error before '*' token
47src/win/wddaccel.c: In function `ddraw_blit_to_self':
48src/win/wddaccel.c:72: warning: implicit declaration of function `IDirectDrawSurface2_BltFast'
49src/win/wddaccel.c:72: error: syntax error before ')' token
50src/win/wddaccel.c:73: error: syntax error before ')' token
51src/win/wddaccel.c:74: error: `DDBLTFAST_WAIT' undeclared (first use in this function)
52src/win/wddaccel.c:74: error: (Each undeclared identifier is reported only once
53src/win/wddaccel.c:74: error: for each function it appears in.)
54src/win/wddaccel.c: In function `ddraw_masked_blit':
55src/win/wddaccel.c:94: error: `DDCOLORKEY' undeclared (first use in this function)
56src/win/wddaccel.c:94: error: syntax error before "src_key"
57src/win/wddaccel.c:109: error: `src_key' undeclared (first use in this function)
58src/win/wddaccel.c:127: warning: implicit declaration of function `IDirectDrawSurface2_SetColorKey'
59src/win/wddaccel.c:127: error: syntax error before ')' token
60src/win/wddaccel.c:128: error: `DDCKEY_SRCBLT' undeclared (first use in this function)
61src/win/wddaccel.c:130: warning: implicit declaration of function `IDirectDrawSurface2_Blt'
62src/win/wddaccel.c:130: error: syntax error before ')' token
63src/win/wddaccel.c:131: error: syntax error before ')' token
64src/win/wddaccel.c:132: error: `DDBLT_KEYSRC' undeclared (first use in this function)
65src/win/wddaccel.c:132: error: `DDBLT_WAIT' undeclared (first use in this function)
66src/win/wddaccel.c: In function `ddraw_do_stretch_blit':
67src/win/wddaccel.c:205: error: `DDCOLORKEY' undeclared (first use in this function)
68src/win/wddaccel.c:205: error: syntax error before "src_key"
69src/win/wddaccel.c:220: error: `src_key' undeclared (first use in this function)
70src/win/wddaccel.c:240: error: syntax error before ')' token
71src/win/wddaccel.c:241: error: `DDCKEY_SRCBLT' undeclared (first use in this function)
72src/win/wddaccel.c:243: error: syntax error before ')' token
73src/win/wddaccel.c:244: error: syntax error before ')' token
74src/win/wddaccel.c:245: error: `DDBLT_KEYSRC' undeclared (first use in this function)
75src/win/wddaccel.c:245: error: `DDBLT_WAIT' undeclared (first use in this function)
76src/win/wddaccel.c: In function `ddraw_clear_to_color':
77src/win/wddaccel.c:270: error: `DDBLTFX' undeclared (first use in this function)
78src/win/wddaccel.c:270: error: syntax error before "blt_fx"
79src/win/wddaccel.c:284: error: `blt_fx' undeclared (first use in this function)
80src/win/wddaccel.c:291: error: syntax error before ')' token
81src/win/wddaccel.c:292: error: `DDBLT_COLORFILL' undeclared (first use in this function)
82src/win/wddaccel.c:292: error: `DDBLT_WAIT' undeclared (first use in this function)
83src/win/wddaccel.c: In function `ddraw_rectfill':
84src/win/wddaccel.c:312: error: `DDBLTFX' undeclared (first use in this function)
85src/win/wddaccel.c:312: error: syntax error before "blt_fx"
86src/win/wddaccel.c:363: error: `blt_fx' undeclared (first use in this function)
87src/win/wddaccel.c:370: error: syntax error before ')' token
88src/win/wddaccel.c:371: error: `DDBLT_COLORFILL' undeclared (first use in this function)
89src/win/wddaccel.c:371: error: `DDBLT_WAIT' undeclared (first use in this function)
90src/win/wddaccel.c: In function `ddraw_hline':
91src/win/wddaccel.c:391: error: `DDBLTFX' undeclared (first use in this function)
92src/win/wddaccel.c:391: error: syntax error before "blt_fx"
93src/win/wddaccel.c:430: error: `blt_fx' undeclared (first use in this function)
94src/win/wddaccel.c:437: error: syntax error before ')' token
95src/win/wddaccel.c:438: error: `DDBLT_COLORFILL' undeclared (first use in this function)
96src/win/wddaccel.c:438: error: `DDBLT_WAIT' undeclared (first use in this function)
97src/win/wddaccel.c: In function `ddraw_vline':
98src/win/wddaccel.c:457: error: `DDBLTFX' undeclared (first use in this function)
99src/win/wddaccel.c:457: error: syntax error before "blt_fx"
100src/win/wddaccel.c:496: error: `blt_fx' undeclared (first use in this function)
101src/win/wddaccel.c:503: error: syntax error before ')' token
102src/win/wddaccel.c:504: error: `DDBLT_COLORFILL' undeclared (first use in this function)
103src/win/wddaccel.c:504: error: `DDBLT_WAIT' undeclared (first use in this function)
104src/win/wddaccel.c: In function `gfx_directx_enable_acceleration':
105src/win/wddaccel.c:531: error: request for member `dwCaps' in something not a structure or union
106src/win/wddaccel.c:531: error: `DDCAPS_BLT' undeclared (first use in this function)
107src/win/wddaccel.c:538: error: request for member `dwCaps' in something not a structure or union
108src/win/wddaccel.c:538: error: `DDCAPS_BLTSTRETCH' undeclared (first use in this function)
109src/win/wddaccel.c:547: error: request for member `dwCaps' in something not a structure or union
110src/win/wddaccel.c:547: error: `DDCAPS_BLTCOLORFILL' undeclared (first use in this function)
111src/win/wddaccel.c:557: error: request for member `dwCaps' in something not a structure or union
112src/win/wddaccel.c:557: error: `DDCAPS_COLORKEY' undeclared (first use in this function)
113src/win/wddaccel.c:558: error: request for member `dwCKeyCaps' in something not a structure or union
114src/win/wddaccel.c:558: error: `DDCKEYCAPS_SRCBLT' undeclared (first use in this function)
115src/win/wddaccel.c:562: error: request for member `dwCaps' in something not a structure or union
116src/win/wddaccel.c: In function `gfx_directx_enable_triple_buffering':
117src/win/wddaccel.c:584: warning: implicit declaration of function `IDirectDrawSurface2_GetFlipStatus'
118src/win/wddaccel.c:584: error: syntax error before ')' token
119src/win/wddaccel.c:584: error: `DDGFS_ISFLIPDONE' undeclared (first use in this function)
120src/win/wddaccel.c:585: error: `DD_OK' undeclared (first use in this function)
121src/win/wddaccel.c:585: error: `DDERR_WASSTILLDRAWING' undeclared (first use in this function)
122mingw32-make: *** [obj/mingw32/alleg/wddaccel.o] Error 1
123 
124C:\Download\PROG\Allegro\allegro421>

EDIT: compiles fine under windows when using dx8_mingw32

"Code is like shit - it only smells if it is not yours"
Allegro Wiki, full of examples and articles !!

MiquelFire
Member #3,110
January 2003
avatar

Quote:

src/win/wddraw.h:33:22: ddraw.h: No such file or directory

Install the DirectX headers.

---
Febreze (and other air fresheners actually) is just below perfumes/colognes, and that's just below dead skunks in terms of smells that offend my nose.
MiquelFire.red
If anyone is of the opinion that there is no systemic racism in America, they're either blind, stupid, or racist too. ~Edgar Reynaldo

GullRaDriel
Member #3,861
September 2003
avatar

I was thinking so, and was doing the tips while you post ;-) I am not that dumb but thanks ;-D

"Code is like shit - it only smells if it is not yours"
Allegro Wiki, full of examples and articles !!

Matthew Leverton
Supreme Loser
January 1999
avatar

Windows binaries are available for testing:

http://www.allegro.cc/files/4.2.1-RC1/

The MSVC 8 binary has a new static runtime version (alleg_s_crt.lib) that will make distributing your Allegro applications a lot easier. Note that if you use it with add-on libraries, you'll have to compile them with the static runtime (/MT) switch.

Evert
Member #794
November 2000
avatar

Technically, it's RC2. RC1 was a while back but didn't go much beyond uploading and noticing that ithad some problems.

kazzmir
Member #1,786
December 2001
avatar

On revision 7511 on osx I got the following doing a sudo make uninstall.

...
rm -f /Library/Documentation/Help/Allegro.bundle/*
rmdir /Library/Documentation/Help/Allegro.bundle
rmdir: /Library/Documentation/Help/Allegro.bundle: No such file or directory
make: [uninstall] Error 1 (ignored)
All gone!

juvinious
Member #5,145
October 2004
avatar

Revsion 7511 osx(intel) I get the following on install:

$ sudo make install
Password:
misc/mdhelper.sh /usr/local/lib /usr/local/include /usr/local/include/allegro /usr/local/include/allegro/platform /usr/local/include/allegro/internal /usr/local/include/allegro/inline /usr/local/bin
install lib/macosx/liballeg-4.2.1.dylib /usr/local/lib
(cd /usr/local/lib; ln -s -f liballeg-4.2.1.dylib liballeg-4.2.dylib)
(cd /usr/local/lib; ln -s -f liballeg-4.2.1.dylib liballeg-4.dylib)
(cd /usr/local/lib; ln -s -f liballeg-4.2.1.dylib liballeg.dylib)
install -d /usr/local/lib
install lib/macosx/liballeg-main.a /usr/local/lib
ranlib /usr/local/lib/liballeg-main.a
install -d /usr/local/bin
allegro-config script created in /usr/local/bin
make: *** No rule to make target `/usr/local/bin/fixbundle', needed by `generic-install'.  Stop.

__________________________________________
Paintown

Lokoci
Member #7,727
September 2006

Hi people!
I'm not a makefile expert.. but for this new release can be done a makefile for Windows/Watcom (not DOS/Watcom)?

Evert
Member #794
November 2000
avatar

Quote:

for this new release can be done [...]

No.
I will only accept bugfixes, no new functionality, let alone adding support for a new compiler. Sorry.

Quote:

a makefile for Windows/Watcom (not DOS/Watcom)?

If someone makes one, sure, for 4.2.2 (say). But if no one volunteers to do it, it won't get done.

EDIT
I'm not sure about those MacOS X errors... I'll see if I can reproduduce and fix them on my laptop (didn't notice them before, but I may just have missed them).

juvinious
Member #5,145
October 2004
avatar

Quote:

I'm not sure about those MacOS X errors... I'll see if I can reproduduce and fix them on my laptop (didn't notice them before, but I may just have missed them).

kazzmir mentioned that he just deleted the fixbundle target to get it to install, but that doesn't sound right. What does fixbundle do?

__________________________________________
Paintown

Evert
Member #794
November 2000
avatar

Quote:

kazzmir mentioned that he just deleted the fixbundle target to get it to install, but that doesn't sound right.

No, it definately isn't.

Quote:

What does fixbundle do?

I'm not exactly sure, as I've never used it myself. It's a tool that makes, or helps to make, an Application Bundle of your game+data. Beyond that, I don't know.

EDIT:

allegro/docs/build/macosx.txt said:

Allegro ships with a little tool, named fixbundle, which allows to build
an application bundle out of an executable.
The utility works from the command line and it accepts a variety of
options to customize your bundle; the easiest way to use it is:

fixbundle executable_name

This will create an application bundle named "executable_name.app" that
contains your program executable and will appear in the finder with the
default application icon. A more complex usage example follows:

fixbundle executable_name -m -o bundle_name -v "1.2" icon.bmp

This creates a bundle named "bundle_name.app". The executable will be
moved instead of copied into the bundle; the application will be marked
as version "1.2" and icon.bmp will be converted to an icon for the
bundle. You can specify more options and up to 4 differently sized
icons (16x16, 32x32, 48x48 and 128x128) to be read from any Allegro
supported image files or from datafile objects.
Run fixbundle without arguments for the full list of known options.

Peter Hull
Member #1,136
March 2001

Kazzmir's error just meant that he didn't install the Apple help bundle, so there's nothing to delete. The makefile uses -rm to keep the makefile running, so it's only a cosmetic error. This is used elsewhere in the uninstall targets, too.

To avoid the message, you can use code like this:

Index: makefile.osx
===================================================================
--- makefile.osx        (revision 7519)
+++ makefile.osx        (working copy)
@@ -272,8 +272,7 @@
          | xargs -n 1 rm -f
        -sed -n -e "s,^@@\(struct\|typedef\).*@\([a-zA-Z0-9_]*\),$(MAN_DIR)/man3/\2.3,p" docs/src/allegro._tx \
          | xargs -n 1 rm -f
-       -rm -f $(HELPBUNDLE)/*
-       -rmdir $(HELPBUNDLE)
+       @test -d $(HELPBUNDLE) && rm -fR $(HELPBUNDLE) || true
 
        @echo All gone!
 

Is this worth modifying throughout?

Pete

kazzmir
Member #1,786
December 2001
avatar

I dont really care about it, honestly I only got into that situation becuase I was trying to reproduce the fixbundle problem.

Do you know what the fix for that is?

Peter Hull
Member #1,136
March 2001

I can't reproduce Juvinious's error, either from my SVN, a clean SVN checkout, or the latest version (the .tar.gz) from Evert's website. Can you confirm it, Evert?

However I did see a deprecated warning for file_size, which I replaced with file_size_ex and committed.

Pete

Evert
Member #794
November 2000
avatar

Quote:

Can you confirm it, Evert?

Yes (iBook G4 running Tiger). The curious thing is that I can do sudo make install-fixbundle, which does install it correctly, after which make install works as it should. So whatever option depends on /usr/local/bin/fixbundle should probably depend on install-fixbundle instead... ?

Peter Hull
Member #1,136
March 2001

Right, gotcha. The secondary problem was that uninstall doesn't remove fixbundle, and I forgot to check. So, make install never had to do any actual work to install it.

Please test this patch to fix both issues.

Pete

1Index: makefile.osx
2===================================================================
3--- makefile.osx (revision 7519)
4+++ makefile.osx (working copy)
5@@ -238,7 +238,7 @@
6 INSTALL_FILES += $(INSTALLDIR)/$(LIBDIR)/lib$(VERSION)-main.a
7 endif
8
9-INSTALL_FILES += $(HEADERS) $(INSTALLDIR)/bin/allegro-config $(INSTALLDIR)/bin/fixbundle
10+INSTALL_FILES += $(HEADERS) $(INSTALLDIR)/bin/allegro-config
11
12 install: generic-install install-fixbundle
13 @echo The $(DESCRIPTION) $(PLATFORM) library has been installed.
14@@ -260,7 +260,7 @@
15 $(HEADERS) \
16 $(INSTALLDIR)/bin/allegro-config
17
18-uninstall: generic-uninstall
19+uninstall: generic-uninstall uninstall-fixbundle
20 rm -f $(INSTALLDIR)/$(LIBDIR)/lib$(VERSION)-$(shared_major_minor).dylib
21 rm -f $(INSTALLDIR)/$(LIBDIR)/lib$(VERSION)-4.dylib
22 rm -f $(INSTALLDIR)/$(LIBDIR)/lib$(VERSION).dylib
23@@ -277,6 +277,9 @@
24
25 @echo All gone!
26
27+uninstall-fixbundle:
28+ -rm -f $(INSTALLDIR)/bin/fixbundle
29+
30 install-framework: $(FRAMEWORK)
31
32 install-applehelp:

Evert
Member #794
November 2000
avatar

I was just about to post a similar patch here (but just for the installation issue):

1Index: makefile.osx
2===================================================================
3--- makefile.osx (revision 7507)
4+++ makefile.osx (working copy)
5@@ -240,7 +240,7 @@
6
7 INSTALL_FILES += $(HEADERS) $(INSTALLDIR)/bin/allegro-config $(INSTALLDIR)/bin/fixbundle
8
9-install: generic-install install-fixbundle
10+install: generic-install
11 @echo The $(DESCRIPTION) $(PLATFORM) library has been installed.
12 @if (printenv PATH |grep -q -v "$(INSTALLDIR)/bin"); then echo "Please check that $(INSTALLDIR)/bin is in your path (see docs/build/macosx.txt)"; fi
13 @echo Run make install-man if you wish to install the man pages.
14@@ -339,6 +339,8 @@
15 @echo Installing man files to $(MAN_DIR)/man3
16 @install docs/man/*.3 $(MAN_DIR)/man3/
17
18+$(INSTALLDIR)/bin/fixbundle: install-fixbundle
19+
20 install-fixbundle: tools/macosx/fixbundle
21 @install $< $(INSTALLDIR)/bin/

It's a bit different from yours in that it keeps fixbundle in the list of PROGRAMS, but removes the explicit dependency on install-fixbundle from the install target. Of course, it adds a /usr/local/bin/fixbundle: install-fixbundle rule, which is similar to the allegro-config rule. These follows the semantics of the other platform-specific makefiles, so I think it's the way to go.

Peter Hull
Member #1,136
March 2001

Fine by me - can you breed some kind of mutant offspring of our two patches to fix both problems...? :)

Pete

[edit]
As kazzmir pointer out to me on IM:

Quote:

r7458 | peterhull90 | 2006-08-11 15:31:19 -0400 (Fri, 11 Aug 2006) | 4 lines

1. Flags for Universal Binary support
2. Install fixbundle by default
3. Remove prebinding flags that are no longer needed

In the old days, fixbundle wasn't installed by default, you had to do it explicitly with sudo make install-fixbundle. That's why things are the way they are.

Evert
Member #794
November 2000
avatar

Sure!

Actually, this is probably closer to my previous patch than it is to yours:

1Index: makefile.osx
2===================================================================
3--- makefile.osx (revision 7520)
4+++ makefile.osx (working copy)
5@@ -223,6 +223,9 @@
6 @chmod a+x $(INSTALLDIR)/bin/allegro-config
7 @echo allegro-config script created in $(INSTALLDIR)/bin
8
9+$(INSTALLDIR)/bin/fixbundle: tools/macosx/fixbundle
10+ @install $< $(INSTALLDIR)/bin/
11+
12 HEADERS = $(INSTALLDIR)/$(INCDIR)/osxalleg.h \
13 $(INSTALLDIR)/$(INCDIR)/allegro/platform/aintosx.h \
14 $(INSTALLDIR)/$(INCDIR)/allegro/platform/aintunix.h \
15@@ -240,7 +243,7 @@
16
17 INSTALL_FILES += $(HEADERS) $(INSTALLDIR)/bin/allegro-config $(INSTALLDIR)/bin/fixbundle
18
19-install: generic-install install-fixbundle
20+install: generic-install
21 @echo The $(DESCRIPTION) $(PLATFORM) library has been installed.
22 @if (printenv PATH |grep -q -v "$(INSTALLDIR)/bin"); then echo "Please check that $(INSTALLDIR)/bin is in your path (see docs/build/macosx.txt)"; fi
23 @echo Run make install-man if you wish to install the man pages.
24@@ -258,7 +261,8 @@
25 $(INSTALLDIR)/$(LIBDIR)/liballd-main.a \
26 $(INSTALLDIR)/$(LIBDIR)/liballp-main.a \
27 $(HEADERS) \
28- $(INSTALLDIR)/bin/allegro-config
29+ $(INSTALLDIR)/bin/allegro-config \
30+ $(INSTALLDIR)/bin/fixbundle
31
32 uninstall: generic-uninstall
33 rm -f $(INSTALLDIR)/$(LIBDIR)/lib$(VERSION)-$(shared_major_minor).dylib
34@@ -339,9 +343,6 @@
35 @echo Installing man files to $(MAN_DIR)/man3
36 @install docs/man/*.3 $(MAN_DIR)/man3/
37
38-install-fixbundle: tools/macosx/fixbundle
39- @install $< $(INSTALLDIR)/bin/
40-
41
42
43 # -------- test capabilities --------

I removed the explicit install-fixbundle target, which was only referenced by $(INSTALLDIR)/bin/fixbundle: anyway. This makes it consistent with the $(INSTALLDIR)/bin/allegro-config: rule, though I wonder if that maybe shouldn't reference a phony install-allegro-config target instead.
Oh, this patch is actually untested, so kazzmir and juvinious should both test if it fixes the problem for them.

 1   2   3 


Go to: