build: change LOT_BUILD to RLOTTIE_BUILD
authorSubhransu Mohanty <sub.mohanty@samsung.com>
Tue, 11 Aug 2020 09:25:01 +0000 (18:25 +0900)
committerJongmin Lee <jm105.lee@samsung.com>
Mon, 17 Aug 2020 22:22:02 +0000 (07:22 +0900)
CMakeLists.txt
inc/rlottie.h
inc/rlottiecommon.h
src/meson.build
src/vector/stb/CMakeLists.txt
src/vector/stb/stb_image.cpp
vs2019/rlottie.vcxproj

index 21bcefb..015504a 100644 (file)
@@ -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
index 9301045..12c413b 100644 (file)
 #include <memory>
 
 #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
index b0302a8..784fbe2 100644 (file)
 #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
index c03ccb8..d93a7e3 100644 (file)
@@ -1,4 +1,4 @@
-compiler_flags = ['-DLOT_BUILD']
+compiler_flags = ['-DRLOTTIE_BUILD']
 
 cc = meson.get_compiler('cpp')
 if (cc.get_id() != 'msvc')
index 54b6bc1..4861e99 100644 (file)
@@ -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}
index ea67017..2c4933e 100644 (file)
 #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
index 13ccbbb..875fca3 100644 (file)
@@ -88,7 +88,7 @@
       <SDLCheck>true</SDLCheck>\r
       <ConformanceMode>true</ConformanceMode>\r
       <AdditionalIncludeDirectories>../inc;./;../src/lottie;../src/vector;../src/vector/pixman;../src/vector/freetype;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <AdditionalOptions>-DLOT_BUILD %(AdditionalOptions)</AdditionalOptions>\r
+      <AdditionalOptions>-DRLOTTIE_BUILD %(AdditionalOptions)</AdditionalOptions>\r
       <DisableSpecificWarnings>4251;4244</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r