[ 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:
> > > > 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.
>
> Milan moved that change to FindFLAC.cmake on the trunk.
Ah, my grep foo must be degrading. I tried to grep for it in cmake/ not sure
why it didn't get seen ::)
So yeah, a lot of those changes are svn merge being a little dumb I assume.
> Peter
>
--
Thomas Fjellstrom
tfjellstrom@xxxxxxxxxx