commit d0abc7986287e7a65b7e3c65907229bdf417e73a
parent 14dd9cf33883eb0238aba0427f5adea0ebe5fadf
Author: fundamental <mark.d.mccurry@gmail.com>
Date: Fri, 22 Jul 2016 11:44:51 -0400
Fixup WIN32 Define Under Mingw
Diffstat:
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -33,7 +33,7 @@ if(CXXTEST_FOUND)
endif()
# lash
if(PkgConfig_FOUND AND NOT (${CMAKE_SYSTEM_NAME} STREQUAL "Windows"))
-message("Looking For pkg config modules")
+ message("Looking For pkg config modules")
pkg_search_module(LASH lash-1.0)
mark_as_advanced(LASH_LIBRARIES)
pkg_search_module(DSSI dssi>=0.9.0)
@@ -244,6 +244,10 @@ message(STATUS "Compiling with liblo")
# other include directories
include_directories(${ZLIB_INCLUDE_DIRS} ${MXML_INCLUDE_DIRS})
+if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+ add_definitions(-DWIN32)
+endif()
+
add_definitions(
-Wall
-Wextra
diff --git a/src/Misc/MiddleWare.cpp b/src/Misc/MiddleWare.cpp
@@ -21,7 +21,6 @@
#include <rtosc/undo-history.h>
#include <rtosc/thread-link.h>
#include <rtosc/ports.h>
-#define WIN32
#include <lo/lo.h>
#include <unistd.h>
diff --git a/src/UI/NSM/Client.H b/src/UI/NSM/Client.H
@@ -19,7 +19,6 @@
#pragma once
-#define WIN32
#include <lo/lo.h>
namespace NSM