Committed. Thanks.
I made some modifications to the configure conditions to AND them
rather than making nested ifs, in some cases. I also decided to leave
the _app builds as-is, so the person doing the build can copy it over
or not if he wishes.
-Alexei
On Mon, Feb 23, 2009 at 6:06 PM, Mike Sliczniak
<bas...@sp...> wrote:
> Hi,
>
> Here is a patch to allow compiling of SS and B2 with an SDL Framework. You
> can get this by downloading from:
>
> http://www.libsdl.org/release/SDL-1.2.13.dmg
>
> SDLMain.[mh] should be placed in BasiliskII/src/SDL, they are from the above
> disk image.
>
> Here is how I tested on an intel 32-bit mac with Mac OS X 10.5.6:
>
> SS ./autogen.sh --disable-standalone-gui --enable-vosf
> --enable-sdl-framework
> --enable-sdl-framework-prefix=/Users/mzs/Library/Frameworks
> --enable-sdl-video --disable-sdl-audio --enable-addressing=real
> --without-esd --without-gtk --without-mon --without-x
>
> SS /autogen.sh --disable-standalone-gui --enable-vosf
> --disable-sdl-framework --disable-sdl-video --disable-sdl-audio
> --enable-addressing=real --without-esd --without-gtk --without-mon --with-x
>
> B2 ./autogen.sh --disable-standalone-gui --enable-vosf
> --enable-sdl-framework
> --enable-sdl-framework-prefix=/Users/mzs/Library/Frameworks
> --enable-sdl-video --enable-sdl-audio --enable-addressing=real --without-esd
> --without-gtk --without-mon --without-x --enable-jit-compiler
>
> B2 ./autogen.sh --disable-standalone-gui --enable-vosf
> --disable-sdl-framework --disable-sdl-video --disable-sdl-audio
> --enable-addressing=real --with-esd --without-gtk --without-mon --with-x
> --enable-jit-compiler
>
> (esound does not really work on mac, esound needs some better coreaudio
> patches.)
>
> Alexei did not like my first patch where I renamed
> MacOSX/PrefsEditor/main.m, so I put in a rule for SDLMain.o in the
> Makefile.in files, but something like this in Makefile.in also works (though
> maybe it would make more sense then to put the SDLMain.[mh] files in MacOSX
> or Darwin so in the future .m files would be built as well as long as they
> were in that dir):
>
> # do not want to generate main.o from ../MacOSX/PrefsEditor/main.m
> $(OBJ_DIR)/%.o : ../SDL/%.m
> $(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) -c $< -o $@
>
> I deliberately did not reindent the changes I made to the configure.ac files
> so that it would be easier to to see how I changed things, whatever gets
> accepted, should be reindented.
>
> configure.ac for SS has two little additional fixes so that the Cocoa
> preferences gui does not get built if you are building for X11 and so that
> you can use esd, sdl, or coreaudio for sound.
>
> One question I have is should the *_app targets copy the SDL framework into
> the app bundle? I think not, so someone doing a build can do that only if
> they wish (suppose they intend to install the SDL framework under
> /Library/Frameworks instead). Or maybe it should and then someone that does
> not want it can simply delete it from the .app bundle afterwards. Both
> options are easy.
>
> mzs
>
> ------------------------------------------------------------------------------
> Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
> -OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
> -Strategies to boost innovation and cut costs with open source participation
> -Receive a $600 discount off the registration fee with the source code: SFAD
> http://p.sf.net/sfu/XcvMzF8H
> _______________________________________________
> basilisk-devel mailing list
> bas...@li...
> https://lists.sourceforge.net/lists/listinfo/basilisk-devel
>
>
|
