Browse Source

Fix windows build

tags/1.9.8
falkTX 6 years ago
parent
commit
ff5c315f7a
5 changed files with 7 additions and 5 deletions
  1. +1
    -1
      source/backend/CarlaUtils.cpp
  2. +1
    -1
      source/bridges-ui/CarlaBridgeFormat.cpp
  3. +1
    -1
      source/bridges-ui/Makefile
  4. +1
    -1
      source/modules/water/water.files.cpp
  5. +3
    -1
      source/utils/CarlaPipeUtils.cpp

+ 1
- 1
source/backend/CarlaUtils.cpp View File

@@ -801,7 +801,7 @@ int carla_cocoa_get_window(void* nsViewPtr)

#include "CarlaPipeUtils.cpp"

#ifndef DEBUG
#if !(defined(DEBUG) || defined(BUILDING_CARLA_FOR_WINDOWS))
# include "water/misc/Time.cpp"
#endif



+ 1
- 1
source/bridges-ui/CarlaBridgeFormat.cpp View File

@@ -351,7 +351,7 @@ CARLA_BRIDGE_UI_END_NAMESPACE

#include "CarlaPipeUtils.cpp"

#ifndef DEBUG
#if !(defined(DEBUG) || defined(BUILDING_CARLA_FOR_WINDOWS))
# include "water/misc/Time.cpp"
#endif



+ 1
- 1
source/bridges-ui/Makefile View File

@@ -23,7 +23,7 @@ endif
# ---------------------------------------------------------------------------------------------------------------------

BUILD_CXX_FLAGS += -DBUILD_BRIDGE -DBUILD_BRIDGE_UI -I. -I$(CWD)/backend -I$(CWD)/includes -I$(CWD)/utils -I$(CWD)/modules
LINK_FLAGS += $(WATER_LIBS)
LINK_FLAGS += $(WATER_LIBS) -lpthread

# ---------------------------------------------------------------------------------------------------------------------



+ 1
- 1
source/modules/water/water.files.cpp View File

@@ -42,7 +42,7 @@ HINSTANCE water_getCurrentModuleInstanceHandle() noexcept
#include "text/StringArray.cpp"
#include "text/String.cpp"
#ifdef DEBUG
#if defined(DEBUG) || defined(BUILDING_CARLA_FOR_WINDOWS)
# include "files/DirectoryIterator.cpp"
# include "files/FileInputStream.cpp"
# include "files/FileOutputStream.cpp"


+ 3
- 1
source/utils/CarlaPipeUtils.cpp View File

@@ -37,7 +37,9 @@
#include "water/misc/Time.h"
#include "water/text/String.h"

#ifndef CARLA_OS_WIN
#ifdef CARLA_OS_WIN
# include <ctime>
#else
# include <cerrno>
# include <signal.h>
# include <sys/wait.h>


Loading…
Cancel
Save