diff options
author | Benoit Bolsee <benoit.bolsee@online.be> | 2009-08-20 13:18:55 +0400 |
---|---|---|
committer | Benoit Bolsee <benoit.bolsee@online.be> | 2009-08-20 13:18:55 +0400 |
commit | 6dbadb23ce26967608710412e9e74396e624c597 (patch) | |
tree | 9d14984dd7c3788bce4b924499dadc5e4ace3aa8 /intern | |
parent | 9f764ae36dbdf571778ec6fc8823ec7e721a2baf (diff) |
update MSVC project files.
Diffstat (limited to 'intern')
-rw-r--r-- | intern/audaspace/jack/AUD_JackDevice.cpp | 4 | ||||
-rw-r--r-- | intern/audaspace/jack/AUD_JackDevice.h | 4 | ||||
-rw-r--r-- | intern/audaspace/make/msvc_9_0/audaspace.vcproj | 19 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_System.cpp | 4 |
4 files changed, 29 insertions, 2 deletions
diff --git a/intern/audaspace/jack/AUD_JackDevice.cpp b/intern/audaspace/jack/AUD_JackDevice.cpp index 445e68e1a9a..1f2c6faa511 100644 --- a/intern/audaspace/jack/AUD_JackDevice.cpp +++ b/intern/audaspace/jack/AUD_JackDevice.cpp @@ -31,6 +31,8 @@ #include <stdio.h> #include <stdlib.h> +#ifdef WITH_JACK + // AUD_XXX this is not realtime suitable! int AUD_JackDevice::jack_mix(jack_nframes_t length, void *data) { @@ -147,3 +149,5 @@ void AUD_JackDevice::playing(bool playing) { // Do nothing. } + +#endif diff --git a/intern/audaspace/jack/AUD_JackDevice.h b/intern/audaspace/jack/AUD_JackDevice.h index 0b09e20b354..e6d332e1160 100644 --- a/intern/audaspace/jack/AUD_JackDevice.h +++ b/intern/audaspace/jack/AUD_JackDevice.h @@ -26,6 +26,8 @@ #ifndef AUD_JACKDEVICE #define AUD_JACKDEVICE +#ifdef WITH_JACK + #include "AUD_SoftwareDevice.h" class AUD_Buffer; @@ -88,4 +90,6 @@ public: virtual ~AUD_JackDevice(); }; +#endif //WITH_JACK + #endif //AUD_JACKDEVICE diff --git a/intern/audaspace/make/msvc_9_0/audaspace.vcproj b/intern/audaspace/make/msvc_9_0/audaspace.vcproj index 2bb97502c4e..a4d775a415c 100644 --- a/intern/audaspace/make/msvc_9_0/audaspace.vcproj +++ b/intern/audaspace/make/msvc_9_0/audaspace.vcproj @@ -717,6 +717,25 @@ >
</File>
</Filter>
+ <Filter
+ Name="jack"
+ >
+ <File
+ RelativePath="..\..\jack\AUD_JackDevice.cpp"
+ >
+ <FileConfiguration
+ Name="Blender Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\..\jack\AUD_JackDevice.h"
+ >
+ </File>
+ </Filter>
<File
RelativePath="..\..\AUD_C-API.h"
>
diff --git a/intern/ghost/intern/GHOST_System.cpp b/intern/ghost/intern/GHOST_System.cpp index 603452cfcbd..229744e2000 100644 --- a/intern/ghost/intern/GHOST_System.cpp +++ b/intern/ghost/intern/GHOST_System.cpp @@ -289,9 +289,9 @@ GHOST_TSuccess GHOST_System::init() #endif #ifdef GHOST_DEBUG - m_eventPrinter = new GHOST_EventPrinter(); if (m_eventManager) { - m_eventManager->addConsumer(m_eventPrinter); + m_eventPrinter = new GHOST_EventPrinter(); + //m_eventManager->addConsumer(m_eventPrinter); } #endif // GHOST_DEBUG |