From 5f9494fa021582f725fed487162cdb043c607a50 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Fri, 11 Jul 2014 13:25:16 +0200 Subject: dedup cpp define --- CMakeLists.txt | 2 -- ftnoir_tracker_base/ftnoir_tracker_base_global.h | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7bf0f201..cbab479b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,8 +26,6 @@ if(CMAKE_COMPILER_IS_GNUCXX AND NOT APPLE) endif() endif() -add_definitions(-DOPENTRACK_MAIN) - if(APPLE) set(apple-frameworks "-stdlib=libc++ -framework Cocoa -framework CoreFoundation -lobjc -lz -framework Carbon") set(CMAKE_SHARED_LINKER_FLAGS " ${apple-frameworks} ${CMAKE_SHARED_LINKER_FLAGS}") diff --git a/ftnoir_tracker_base/ftnoir_tracker_base_global.h b/ftnoir_tracker_base/ftnoir_tracker_base_global.h index df793f30..6d6a1918 100644 --- a/ftnoir_tracker_base/ftnoir_tracker_base_global.h +++ b/ftnoir_tracker_base/ftnoir_tracker_base_global.h @@ -4,7 +4,7 @@ #include #ifndef FTNOIR_TRACKER_BASE_EXPORT -# ifdef OPENTRACK_MAIN +# ifdef IN_OPENTRACK # if !defined(_MSC_VER) # define FTNOIR_TRACKER_BASE_EXPORT __attribute__ ((visibility ("default"))) Q_DECL_EXPORT # else -- cgit v1.2.3