From d2a822a095eb425bba2a8fbc8762c74b1d01d3cf Mon Sep 17 00:00:00 2001 From: Subhransu Mohanty Date: Tue, 11 Aug 2020 18:25:01 +0900 Subject: [PATCH] build: change LOT_BUILD to RLOTTIE_BUILD --- CMakeLists.txt | 4 ++-- inc/rlottie.h | 4 ++-- inc/rlottiecommon.h | 4 ++-- src/meson.build | 2 +- src/vector/stb/CMakeLists.txt | 2 +- src/vector/stb/stb_image.cpp | 4 ++-- vs2019/rlottie.vcxproj | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 21bcefb..015504a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ endif() #declare target add_library( rlottie ) -set_target_properties( rlottie PROPERTIES DEFINE_SYMBOL LOT_BUILD ) +set_target_properties( rlottie PROPERTIES DEFINE_SYMBOL RLOTTIE_BUILD ) #declare version of the target set(player_version_major 0) @@ -73,7 +73,7 @@ if (NOT WIN32) endif() if (WIN32 AND NOT BUILD_SHARED_LIBS) - target_compile_definitions(rlottie PUBLIC -DLOT_BUILD=0) + target_compile_definitions(rlottie PUBLIC -DRLOTTIE_BUILD=0) endif() #declare dependancy diff --git a/inc/rlottie.h b/inc/rlottie.h index 9301045..12c413b 100644 --- a/inc/rlottie.h +++ b/inc/rlottie.h @@ -28,13 +28,13 @@ #include #if defined _WIN32 || defined __CYGWIN__ - #ifdef LOT_BUILD + #ifdef RLOTTIE_BUILD #define RLOTTIE_API __declspec(dllexport) #else #define RLOTTIE_API __declspec(dllimport) #endif #else - #ifdef LOT_BUILD + #ifdef RLOTTIE_BUILD #define RLOTTIE_API __attribute__ ((visibility ("default"))) #else #define RLOTTIE_API diff --git a/inc/rlottiecommon.h b/inc/rlottiecommon.h index b0302a8..784fbe2 100644 --- a/inc/rlottiecommon.h +++ b/inc/rlottiecommon.h @@ -24,13 +24,13 @@ #define _RLOTTIE_COMMON_H_ #if defined _WIN32 || defined __CYGWIN__ - #ifdef LOT_BUILD + #ifdef RLOTTIE_BUILD #define RLOTTIE_API __declspec(dllexport) #else #define RLOTTIE_API __declspec(dllimport) #endif #else - #ifdef LOT_BUILD + #ifdef RLOTTIE_BUILD #define RLOTTIE_API __attribute__ ((visibility ("default"))) #else #define RLOTTIE_API diff --git a/src/meson.build b/src/meson.build index c03ccb8..d93a7e3 100644 --- a/src/meson.build +++ b/src/meson.build @@ -1,4 +1,4 @@ -compiler_flags = ['-DLOT_BUILD'] +compiler_flags = ['-DRLOTTIE_BUILD'] cc = meson.get_compiler('cpp') if (cc.get_id() != 'msvc') diff --git a/src/vector/stb/CMakeLists.txt b/src/vector/stb/CMakeLists.txt index 54b6bc1..4861e99 100644 --- a/src/vector/stb/CMakeLists.txt +++ b/src/vector/stb/CMakeLists.txt @@ -13,7 +13,7 @@ if(LOTTIE_MODULE) endif() set_target_properties(rlottie-image-loader PROPERTIES - DEFINE_SYMBOL LOT_BUILD + DEFINE_SYMBOL RLOTTIE_BUILD PREFIX "" SUFFIX "" OUTPUT_NAME ${LOTTIE_MODULE_FILENAME} diff --git a/src/vector/stb/stb_image.cpp b/src/vector/stb/stb_image.cpp index ea67017..2c4933e 100644 --- a/src/vector/stb/stb_image.cpp +++ b/src/vector/stb/stb_image.cpp @@ -14,13 +14,13 @@ #include "stb_image.h" #if defined _WIN32 || defined __CYGWIN__ - #ifdef LOT_BUILD + #ifdef RLOTTIE_BUILD #define RLOTTIE_API __declspec(dllexport) #else #define RLOTTIE_API __declspec(dllimport) #endif #else - #ifdef LOT_BUILD + #ifdef RLOTTIE_BUILD #define RLOTTIE_API __attribute__ ((visibility ("default"))) #else #define RLOTTIE_API diff --git a/vs2019/rlottie.vcxproj b/vs2019/rlottie.vcxproj index 13ccbbb..875fca3 100644 --- a/vs2019/rlottie.vcxproj +++ b/vs2019/rlottie.vcxproj @@ -88,7 +88,7 @@ true true ../inc;./;../src/lottie;../src/vector;../src/vector/pixman;../src/vector/freetype;%(AdditionalIncludeDirectories) - -DLOT_BUILD %(AdditionalOptions) + -DRLOTTIE_BUILD %(AdditionalOptions) 4251;4244 -- 2.34.1