Merge branch '1.1.2-release' into 'master'

Version 1.1.2 See merge request k202009/libaec!7
MathisRosenhauer · Oct 4, 2023 · be7cc28 · be7cc28
2 parents 177ce61 + a3821c9
commit be7cc28
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 # libaec Changelog
 All notable changes to libaec will be documented in this file.
 
+## [1.1.2] - 2023-10-04
+
+### Fixed
+- Compile issue with MSVC
+
 ## [1.1.1] - 2023-09-29
 
 ### Fixed

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.13...3.19)
-project(libaec LANGUAGES C VERSION 1.1.1)
+project(libaec LANGUAGES C VERSION 1.1.2)
 
 # Automatically export symbols for Windows DLLs
 set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS TRUE)

diff --git a/configure.ac b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ([2.71])
 
 m4_define([VERSION_MAJOR], [1])
 m4_define([VERSION_MINOR], [1])
-m4_define([VERSION_PATCH], [1])
+m4_define([VERSION_PATCH], [2])
 
 AC_INIT([libaec],[VERSION_MAJOR.VERSION_MINOR.VERSION_PATCH],[[email protected]])
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -22,7 +22,7 @@ add_library(aec_shared SHARED "$<TARGET_OBJECTS:aec>")
 target_link_libraries(aec_shared PUBLIC aec)
 set_target_properties(aec_shared
   PROPERTIES
-  VERSION 0.1.1
+  VERSION 0.1.2
   SOVERSION 0
   OUTPUT_NAME aec
   PUBLIC_HEADER ${CMAKE_CURRENT_BINARY_DIR}/../include/libaec.h)

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -5,7 +5,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include \
 lib_LTLIBRARIES = libaec.la libsz.la
 libaec_la_SOURCES = encode.c encode_accessors.c decode.c vector.c\
 encode.h encode_accessors.h decode.h vector.h
-libaec_la_LDFLAGS = -version-info 1:1:1 -no-undefined
+libaec_la_LDFLAGS = -version-info 1:2:1 -no-undefined
 
 libsz_la_SOURCES = sz_compat.c
 libsz_la_LIBADD = libaec.la