Changing API level back to 1

diff --git a/build/tizen/.gitignore b/build/tizen/.gitignore
index 97ad54c76eb0b09ba48222f3c56e751d1c58b462..a955344ec6577de069033d67e2038ab3d001f6e7 100644 (file)
--- a/build/tizen/.gitignore
+++ b/build/tizen/.gitignore
@@ -4,5 +4,9 @@
 
 .ninja_deps
 .ninja_log
+build.ninja
 
-/*.dylib
\ No newline at end of file
+/*.dylib
+
+libdali-core.so.1
+libdali-core.so.1.0.0

diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt
index 23fd4b58718bc1c17378ef2b8f9ea7e7f997c81f..be988a899ac69846ab26c101fe8b827029e5bb92 100644 (file)
--- a/build/tizen/CMakeLists.txt
+++ b/build/tizen/CMakeLists.txt
@@ -1,7 +1,7 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 3.8.2)
 CMAKE_POLICY(SET CMP0012 NEW) # Prevent dereferencing of OFF/ON as variables
 
-SET(name "dali2-core")
+SET(name "dali-core")
 
 SET(CMAKE_C_STANDARD 99)
 SET(CMAKE_CXX_STANDARD 17)
@@ -16,7 +16,7 @@ IF(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
 ENDIF()
 
 # API VERSION (Not DALi release version)
-SET(${name}_VERSION_MAJOR 2)
+SET(${name}_VERSION_MAJOR 1)
 SET(${name}_VERSION_MINOR 0)
 SET(${name}_VERSION_PATCH 0)
 SET(${name}_VERSION ${${name}_VERSION_MAJOR}.${${name}_VERSION_MINOR}.${${name}_VERSION_PATCH})
@@ -128,7 +128,7 @@ IF( ENABLE_PKG_CONFIGURE )
   # Requires the following variables to be setup:
   # @PREFIX@ @EXEC_PREFIX@ @DALI_VERSION@ @LIB_DIR@ @DEV_INCLUDE_PATH@
   SET( DEV_INCLUDE_PATH ${INCLUDE_DIR} )
-  SET( CORE_PKG_CFG_FILE ${CMAKE_CURRENT_SOURCE_DIR}/dali2-core.pc )
+  SET( CORE_PKG_CFG_FILE ${CMAKE_CURRENT_SOURCE_DIR}/dali-core.pc )
   CONFIGURE_FILE( ${CORE_PKG_CFG_FILE}.in ${CORE_PKG_CFG_FILE} @ONLY )
 ENDIF()
 

diff --git a/build/tizen/dali-core.pc.in b/build/tizen/dali-core.pc.in
new file mode 100644 (file)
index 0000000..d1b8f7a
--- /dev/null
+++ b/build/tizen/dali-core.pc.in
@@ -0,0 +1,12 @@
+prefix=@PREFIX@
+exec_prefix=@EXEC_PREFIX@
+apiversion=@DALI_VERSION@
+libdir=@LIB_DIR@
+includedir=@DEV_INCLUDE_PATH@
+
+Name: DALi 3D Engine
+Description: Cross platform 3D Engine
+Version: ${apiversion}
+Requires:
+Libs: -L${libdir} -ldali-core
+Cflags: -I${includedir}

diff --git a/build/tizen/dali2-core.pc.in b/build/tizen/dali2-core.pc.in
deleted file mode 100644 (file)
index de15e39..0000000
--- a/build/tizen/dali2-core.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=@PREFIX@
-exec_prefix=@EXEC_PREFIX@
-apiversion=@DALI_VERSION@
-libdir=@LIB_DIR@
-includedir=@DEV_INCLUDE_PATH@
-
-Name: DALi 3D Engine
-Description: Cross platform 3D Engine
-Version: ${apiversion}
-Requires:
-Libs: -L${libdir} -ldali2-core
-Cflags: -I${includedir}