Browse Source

Use linux as OS fallback if not mac or windows

pull/17/head
falkTX 8 years ago
parent
commit
de41152255
4 changed files with 7 additions and 16 deletions
  1. +1
    -3
      dgl/src/Window.cpp
  2. +3
    -3
      distrho/extra/ExternalWindow.hpp
  3. +2
    -2
      distrho/extra/Thread.hpp
  4. +1
    -8
      distrho/src/DistrhoDefines.h

+ 1
- 3
dgl/src/Window.cpp View File

@@ -29,14 +29,12 @@
# include "pugl/pugl_win.cpp" # include "pugl/pugl_win.cpp"
#elif defined(DISTRHO_OS_MAC) #elif defined(DISTRHO_OS_MAC)
# include "pugl/pugl_osx.m" # include "pugl/pugl_osx.m"
#elif defined(DISTRHO_OS_LINUX)
#else
# include <sys/types.h> # include <sys/types.h>
# include <unistd.h> # include <unistd.h>
extern "C" { extern "C" {
# include "pugl/pugl_x11.c" # include "pugl/pugl_x11.c"
} }
#else
# error Unsupported platform
#endif #endif


#include "ApplicationPrivateData.hpp" #include "ApplicationPrivateData.hpp"


+ 3
- 3
distrho/extra/ExternalWindow.hpp View File

@@ -19,13 +19,13 @@


#include "String.hpp" #include "String.hpp"


#ifdef DISTRHO_OS_UNIX
#ifdef DISTRHO_OS_WINDOWS
# error Unsupported platform!
#else
# include <cerrno> # include <cerrno>
# include <signal.h> # include <signal.h>
# include <sys/wait.h> # include <sys/wait.h>
# include <unistd.h> # include <unistd.h>
#else
# error Unsupported platform!
#endif #endif


START_NAMESPACE_DISTRHO START_NAMESPACE_DISTRHO


+ 2
- 2
distrho/extra/Thread.hpp View File

@@ -21,7 +21,7 @@
#include "Sleep.hpp" #include "Sleep.hpp"
#include "String.hpp" #include "String.hpp"


#ifdef DISTRHO_OS_LINUX_FULL
#ifdef DISTRHO_OS_LINUX
# include <sys/prctl.h> # include <sys/prctl.h>
#endif #endif


@@ -198,7 +198,7 @@ public:
{ {
DISTRHO_SAFE_ASSERT_RETURN(name != nullptr && name[0] != '\0',); DISTRHO_SAFE_ASSERT_RETURN(name != nullptr && name[0] != '\0',);


#ifdef DISTRHO_OS_LINUX_FULL
#ifdef DISTRHO_OS_LINUX
prctl(PR_SET_NAME, name, 0, 0, 0); prctl(PR_SET_NAME, name, 0, 0, 0);
#endif #endif
#if defined(__GLIBC__) && (__GLIBC__ * 1000 + __GLIBC_MINOR__) >= 2012 #if defined(__GLIBC__) && (__GLIBC__ * 1000 + __GLIBC_MINOR__) >= 2012


+ 1
- 8
distrho/src/DistrhoDefines.h View File

@@ -38,17 +38,10 @@
# elif defined(__HAIKU__) # elif defined(__HAIKU__)
# define DISTRHO_OS_HAIKU 1 # define DISTRHO_OS_HAIKU 1
# elif defined(__linux__) || defined(__linux) # elif defined(__linux__) || defined(__linux)
# define DISTRHO_OS_LINUX 1
# define DISTRHO_OS_LINUX_FULL 1
# elif defined(__FreeBSD__) || defined(__GNU__)
# define DISTRHO_OS_LINUX 1
# define DISTRHO_OS_LINUX 1
# endif # endif
#endif #endif


#if defined(DISTRHO_OS_LINUX) || defined(DISTRHO_OS_MAC)
# define DISTRHO_OS_UNIX
#endif

#ifndef DISTRHO_DLL_EXTENSION #ifndef DISTRHO_DLL_EXTENSION
# define DISTRHO_DLL_EXTENSION "so" # define DISTRHO_DLL_EXTENSION "so"
#endif #endif


Loading…
Cancel
Save