[ Thread Index |
Date Index
| More lists.liballeg.org/allegro-developers Archives
]
On Monday 06 October 2008, Peter Wang wrote:
> On 2008-10-06, Thomas Fjellstrom <tfjellstrom@xxxxxxxxxx> wrote:
> > On Monday 06 October 2008, Peter Wang wrote:
> > > On 2008-10-06, Thomas Fjellstrom <tfjellstrom@xxxxxxxxxx> wrote:
> > > > Attached is the (large) diff I generated using 'svn diff', let me
> > > > know if theres any problems. Or if its ok for me to merge fshook into
> > > > 4.9. If its ok, the fshook history is a bit of a mess, so I suppose
> > > > it doesn't matter if we merge, or just apply the patch.
> > >
> > > Thanks for that.
> > >
> > > It looks *mostly* okay (only really skimmed it at this point).
> > > Some minor things but we can fix those afterwards.
> > >
> > > But, there are some changes that shouldn't be there, e.g. in
> > > CMakeLists.txt,
> > > readme_a5.txt,
> > > addons/kcm_audio/CMakeLists.txt,
> > > addons/acodec/CMakeLists.txt
> > >
> > > I'm not sure the FSHOOK-TODO should be there either.
> >
> > Yeah, if I apply I'll weed out stuff like FSHOOK-TODO. I'll look at the
> > others, but I think some CMakeList changes are needed, which specifically
> > are you against?
> >
> >
[snip]
> > Index: addons/acodec/CMakeLists.txt
> > ===================================================================
> > --- addons/acodec/CMakeLists.txt (.../4.9) (revision 11023)
> > +++ addons/acodec/CMakeLists.txt (.../4.9-fshook) (revision 11023)
> > @@ -32,6 +32,9 @@
> > set(ALLEGRO_CFG_ACODEC_FLAC 1)
> > include_directories(${FLAC_INCLUDE_DIR})
> > list(APPEND ACODEC_EXTRA_LIBS ${FLAC_LIBRARIES})
> > + if(WIN32)
> > + list(APPEND ACODEC_EXTRA_LIBS -lwsock32)
> > + endif(WIN32)
> > list(APPEND ACODEC_SOURCES flac.c)
> > endif(FLAC_COMPILES)
> > endif(FLAC_FOUND)
>
> Revert that.
Nope, sorry. FLAC uses ntol iirc, and that only exists in wsock32 afaik. It
does however need to be changed to remove the -l
without that change it wasn't compiling at all with mingw for me.
[snip]
> > @@ -465,12 +505,12 @@
> > include/allegro5/platform/alplatf.h
> > )
> >
> > -if(UNIX)
> > +if(UNIX OR WIN32)
> > configure_file(
> > - include/allegro5/platform/alunixac.h.cmake
> > - include/allegro5/platform/alunixac.h
> > + include/allegro5/platform/al_cfg.h.cmake
> > + include/allegro5/platform/al_cfg.h
> > )
> > -endif(UNIX)
> > +endif(UNIX OR WIN32)
>
> I don't like the name al_cfg.h as we already have alconfig.h, but leave
> it for now.
Maybe you and trent can come up with a better name? He was the person who
changed that stuff to get fshook compiling under windows.
> Peter
>
Everything else looks ok, and I'll fix up soon.
--
Thomas Fjellstrom
tfjellstrom@xxxxxxxxxx