| Hi Felipe,
The only main change I see is the addition of AvailabilityMacros.h in
sysdep.h, which is done already in git. The other parts to deal with
header location changes seem to be working alright, so I think we're
fine there.
Thanks!
steven
On Sun, May 1, 2011 at 9:45 PM, Felipe Sateler wrote:
> I see the following diff. I don0t know if it is still relevant.
>
>
> diff -r b7cc15664b02 H/csound_orc.h
> --- a/H/csound_orc.h Wed Jul 28 12:48:55 2010 -0400
> +++ b/H/csound_orc.h Sun May 01 22:43:20 2011 -0300
> @@ -11,7 +11,7 @@
> struct TREE *right;
> struct TREE *next;
> } TREE;
> -#include "../Engine/csound_orcparse.h"
> +#include "csound_orcparse.h"
> #include "csoundCore.h"
>
> enum {
> diff -r b7cc15664b02 H/sysdep.h
> --- a/H/sysdep.h Wed Jul 28 12:48:55 2010 -0400
> +++ b/H/sysdep.h Sun May 01 22:43:20 2011 -0300
> @@ -62,6 +62,10 @@
> typedef uint_least16_t uint16;
> #endif
>
> +#ifdef __MACH__
> +#include
> +#endif
> +
> #ifdef USE_DOUBLE
> #define ACOS acos
> #define ASIN asin
> diff -r b7cc15664b02 Opcodes/gab/gab.h
> --- a/Opcodes/gab/gab.h Wed Jul 28 12:48:55 2010 -0400
> +++ b/Opcodes/gab/gab.h Sun May 01 22:43:20 2011 -0300
> @@ -22,7 +22,7 @@
> #define GAB_H
>
> #include "../stdopcod.h"
> -#include "H/ugrw1.h" /* for zread function */
> +#include "ugrw1.h" /* for zread function */
> #include "ugens6.h" /* for a_k_set function */
>
> typedef struct {
>
>
>
>
> On Sun, May 1, 2011 at 22:10, Steven Yi wrote:
>> Hi Felipe,
>>
>> The only change I saw was for CounterPoint.hpp (using stdlib.h instead
>> of malloc.h) which I committed to git before committing the CMake
>> files. Otherwise, everything is currently building for me. If I
>> missed anything, just let me know!
>>
>> steven
>>
>>
>>
>> On Sun, May 1, 2011 at 7:29 PM, Felipe Sateler wrote:
>>> I remember we had to make a couple of minor changes to the csound
>>> source to get it to play a bit more nicely with out of tree builds.
>>> Steven, did you make those changes too in the git tree?
>>>
>>> On Sun, May 1, 2011 at 08:54, Andres Cabrera wrote:
>>>> The error can be fixed with:
>>>>
>>>> -------------------------------- Top/threads.c --------------------------------
>>>> index 66da06c..895c0b4 100644
>>>> @@ -181,7 +181,6 @@ PUBLIC void csoundSleep(size_t milliseconds)
>>>>
>>>> #define BARRIER_SERIAL_THREAD (-1)
>>>>
>>>> -/* VL: already defined in CsoundCore.h:70
>>>> #if !defined(HAVE_PTHREAD_BARRIER_INIT)
>>>>
>>>> typedef struct barrier {
>>>> @@ -191,7 +190,6 @@ typedef struct barrier {
>>>> } barrier_t;
>>>>
>>>> #endif
>>>> -*/
>>>>
>>>> PUBLIC void *csoundCreateThread(uintptr_t (*threadRoutine)(void *),
>>>> void *userdata)
>>>>
>>>> This also should fix John's report:
>>>> http://csound.1045644.n5.nabble.com/cs-and-threads-td3412324.html
>>>>
>>>> Now having a build inside Eclipse. Nice.
>>>>
>>>> Cheers,
>>>> Andres
>>>>
>>>> On Sun, May 1, 2011 at 3:48 AM, Steven Yi wrote:
>>>>> Hi All,
>>>>>
>>>>> Felipe and I had been working off and on for a CMake build for Csound.
>>>>> I wanted to get the CMake files in sync with the latest in Csound so
>>>>> have imported and updated the CMake files into the git repository. To
>>>>> note:
>>>>>
>>>>> 1. This is not an official build system for Csound.
>>>>>
>>>>> 2. I will be using and updating this to match as closely to the Scons
>>>>> system as possible.
>>>>>
>>>>> 3. I am using these files so that I can start working on Csound once
>>>>> again more closely, as it allows me to generate Makefiles, XCode
>>>>> projects, and Eclipse projects, all of which I enjoy using for
>>>>> development. (For a list of what it supports, see:
>>>>> http://www.cmake.org/cmake/help/cmake-2-8-docs.html#section_Generators)
>>>>>
>>>>> 4. The system is not yet 100% on par with the SConstruct build for
>>>>> release builds, though I would say probably 95% of what is in
>>>>> SConstruct is in the CMake build. (Felipe: I updated to add csbeats
>>>>> today, which is the only target which was new from when we started
>>>>> working and latest in git, though I just realized we should remove the
>>>>> OLPC stuff like it had been done in SConstruct).
>>>>>
>>>>> 5. There is a Custom.cmake.ex file that is to be used like custom.py.
>>>>> To use it, you will need to copy it to Custom.cmake and modify.
>>>>>
>>>>> As far as I remember where we had last left it, everything was
>>>>> building on OSX and Linux, though CsoundAC was having some issues
>>>>> building on Windows. Last I checked too some of the target seemed to
>>>>> build statically linking instead of dynamically linking on some
>>>>> things, but I don't remember which platform that was on.
>>>>>
>>>>> One difference we put in is that the CMake files will build everything
>>>>> that it can (meaning what it has found all dependencies for) by
>>>>> default. Commandline options are provided to turn things off.
>>>>>
>>>>> In using CMake I've found that I prefer it's emphasis on out of source
>>>>> builds, it's general build speed (seems to build more quickly for me
>>>>> than Scons), and the ability to use my favorite coding environments in
>>>>> navigating through and working with Csound code. If anyone else is
>>>>> interested to take a look and give it a try, I'll be happy to assist.
>>>>>
>>>>> Thanks!
>>>>> steven
>>>>>
>>>>> ------------------------------------------------------------------------------
>>>>> WhatsUp Gold - Download Free Network Management Software
>>>>> The most intuitive, comprehensive, and cost-effective network
>>>>> management toolset available today. Delivers lowest initial
>>>>> acquisition cost and overall TCO of any competing solution.
>>>>> http://p.sf.net/sfu/whatsupgold-sd
>>>>> _______________________________________________
>>>>> Csound-devel mailing list
>>>>> Csound-devel@lists.sourceforge.net
>>>>> https://lists.sourceforge.net/lists/listinfo/csound-devel
>>>>>
>>>>
>>>> ------------------------------------------------------------------------------
>>>> WhatsUp Gold - Download Free Network Management Software
>>>> The most intuitive, comprehensive, and cost-effective network
>>>> management toolset available today. Delivers lowest initial
>>>> acquisition cost and overall TCO of any competing solution.
>>>> http://p.sf.net/sfu/whatsupgold-sd
>>>> _______________________________________________
>>>> Csound-devel mailing list
>>>> Csound-devel@lists.sourceforge.net
>>>> https://lists.sourceforge.net/lists/listinfo/csound-devel
>>>>
>>>
>>>
>>>
>>> --
>>>
>>> Saludos,
>>> Felipe Sateler
>>>
>>> ------------------------------------------------------------------------------
>>> WhatsUp Gold - Download Free Network Management Software
>>> The most intuitive, comprehensive, and cost-effective network
>>> management toolset available today. Delivers lowest initial
>>> acquisition cost and overall TCO of any competing solution.
>>> http://p.sf.net/sfu/whatsupgold-sd
>>> _______________________________________________
>>> Csound-devel mailing list
>>> Csound-devel@lists.sourceforge.net
>>> https://lists.sourceforge.net/lists/listinfo/csound-devel
>>>
>>
>> ------------------------------------------------------------------------------
>> WhatsUp Gold - Download Free Network Management Software
>> The most intuitive, comprehensive, and cost-effective network
>> management toolset available today. Delivers lowest initial
>> acquisition cost and overall TCO of any competing solution.
>> http://p.sf.net/sfu/whatsupgold-sd
>> _______________________________________________
>> Csound-devel mailing list
>> Csound-devel@lists.sourceforge.net
>> https://lists.sourceforge.net/lists/listinfo/csound-devel
>>
>
>
>
> --
>
> Saludos,
> Felipe Sateler
>
> ------------------------------------------------------------------------------
> WhatsUp Gold - Download Free Network Management Software
> The most intuitive, comprehensive, and cost-effective network
> management toolset available today. Delivers lowest initial
> acquisition cost and overall TCO of any competing solution.
> http://p.sf.net/sfu/whatsupgold-sd
> _______________________________________________
> Csound-devel mailing list
> Csound-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/csound-devel
>
------------------------------------------------------------------------------
WhatsUp Gold - Download Free Network Management Software
The most intuitive, comprehensive, and cost-effective network
management toolset available today. Delivers lowest initial
acquisition cost and overall TCO of any competing solution.
http://p.sf.net/sfu/whatsupgold-sd
_______________________________________________
Csound-devel mailing list
Csound-devel@lists.sourceforge.net |