diff --git a/CMakeLists.txt b/CMakeLists.txt index 13a714ac..a2150846 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -109,6 +109,7 @@ SET(LIB_MAJOR_VERSION "1") SET(LIB_MINOR_VERSION "19") SET(LIB_REVISION "1") SET(LIB_VERSION "${LIB_MAJOR_VERSION}.${LIB_MINOR_VERSION}.${LIB_REVISION}") +SET(LIB_VERSION_NUM ${LIB_MAJOR_VERSION},${LIB_MINOR_VERSION},${LIB_REVISION},0) SET(EXPORT_DECL "") @@ -1131,6 +1132,7 @@ IF(GIT_FOUND AND EXISTS "${OpenAL_SOURCE_DIR}/.git") ADD_CUSTOM_TARGET(build_version ${CMAKE_COMMAND} -D GIT_EXECUTABLE=${GIT_EXECUTABLE} -D LIB_VERSION=${LIB_VERSION} + -D LIB_VERSION_NUM=${LIB_VERSION_NUM} -D SRC=${OpenAL_SOURCE_DIR}/version.h.in -D DST=${OpenAL_BINARY_DIR}/version.h -P ${OpenAL_SOURCE_DIR}/version.cmake @@ -1283,8 +1285,10 @@ ELSE() ENDIF() ENDIF() + SET(RC_CONFIG resources/openal32.rc) IF(WIN32 AND ALSOFT_BUILD_ROUTER) ADD_LIBRARY(OpenAL SHARED + resources/router.rc router/router.cpp router/router.h router/alc.cpp @@ -1312,9 +1316,10 @@ ELSE() SET(LIBNAME "soft_oal") SET(IMPL_TARGET soft_oal) + SET(RC_CONFIG resources/soft_oal.rc) ENDIF() - ADD_LIBRARY(${IMPL_TARGET} SHARED ${COMMON_OBJS} ${OPENAL_OBJS} ${ALC_OBJS}) + ADD_LIBRARY(${IMPL_TARGET} SHARED ${COMMON_OBJS} ${OPENAL_OBJS} ${ALC_OBJS} ${RC_CONFIG}) IF(WIN32) SET_TARGET_PROPERTIES(${IMPL_TARGET} PROPERTIES PREFIX "") ENDIF() diff --git a/resources/openal32.rc b/resources/openal32.rc new file mode 100644 index 00000000..28475185 Binary files /dev/null and b/resources/openal32.rc differ diff --git a/resources/resource.h b/resources/resource.h new file mode 100644 index 00000000..287c9113 --- /dev/null +++ b/resources/resource.h @@ -0,0 +1,15 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by openal32.rc, router.rc, soft_oal.rc +// + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 101 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1000 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/resources/router.rc b/resources/router.rc new file mode 100644 index 00000000..71205f8f Binary files /dev/null and b/resources/router.rc differ diff --git a/resources/soft_oal.rc b/resources/soft_oal.rc new file mode 100644 index 00000000..c29cfb3d Binary files /dev/null and b/resources/soft_oal.rc differ diff --git a/version.h.in b/version.h.in index 56f738a3..9bb439d8 100644 --- a/version.h.in +++ b/version.h.in @@ -1,5 +1,6 @@ /* Define to the library version */ #define ALSOFT_VERSION "${LIB_VERSION}" +#define ALSOFT_VERSION_NUM ${LIB_VERSION_NUM} /* Define the branch being built */ #define ALSOFT_GIT_BRANCH "${GIT_BRANCH}"