Make logical target name `openal` uniform accross all platforms

1 files changed, 42 insertions, 41 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a8aa079b..b71fb44c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -62,10 +62,7 @@ if(DEFINED LIB_SUFFIX)
 endif()
 
 
-IF(NOT WIN32)
-    SET(LIBNAME openal)
-ELSE()
-    SET(LIBNAME OpenAL32)
+IF(WIN32)
     ADD_DEFINITIONS("-D_WIN32 -D_WIN32_WINNT=0x0502")
 
     # This option is mainly for static linking OpenAL Soft into another project
@@ -1249,55 +1246,59 @@ ENDIF()
 
 # Build main library
 IF(LIBTYPE STREQUAL "STATIC")
-    ADD_LIBRARY(${LIBNAME} STATIC ${COMMON_OBJS} ${OPENAL_OBJS} ${ALC_OBJS})
+    ADD_LIBRARY(openal STATIC ${COMMON_OBJS} ${OPENAL_OBJS} ${ALC_OBJS})
 ELSE()
-    ADD_LIBRARY(${LIBNAME} SHARED ${OPENAL_OBJS} ${ALC_OBJS})
+    ADD_LIBRARY(openal SHARED ${OPENAL_OBJS} ${ALC_OBJS})
 ENDIF()
-SET_PROPERTY(TARGET ${LIBNAME} APPEND PROPERTY COMPILE_FLAGS ${EXTRA_CFLAGS})
-SET_PROPERTY(TARGET ${LIBNAME} APPEND PROPERTY COMPILE_DEFINITIONS AL_BUILD_LIBRARY AL_ALEXT_PROTOTYPES)
+SET_PROPERTY(TARGET openal APPEND PROPERTY COMPILE_FLAGS ${EXTRA_CFLAGS})
+SET_PROPERTY(TARGET openal APPEND PROPERTY COMPILE_DEFINITIONS AL_BUILD_LIBRARY AL_ALEXT_PROTOTYPES)
 IF(WIN32 AND ALSOFT_NO_UID_DEFS)
-    SET_PROPERTY(TARGET ${LIBNAME} APPEND PROPERTY COMPILE_DEFINITIONS AL_NO_UID_DEFS)
+    SET_PROPERTY(TARGET openal APPEND PROPERTY COMPILE_DEFINITIONS AL_NO_UID_DEFS)
 ENDIF()
-SET_PROPERTY(TARGET ${LIBNAME} APPEND PROPERTY INCLUDE_DIRECTORIES "${OpenAL_SOURCE_DIR}/OpenAL32/Include" "${OpenAL_SOURCE_DIR}/Alc")
+SET_PROPERTY(TARGET openal APPEND PROPERTY INCLUDE_DIRECTORIES "${OpenAL_SOURCE_DIR}/OpenAL32/Include" "${OpenAL_SOURCE_DIR}/Alc")
 IF(HAVE_ALSA)
-    SET_PROPERTY(TARGET ${LIBNAME} APPEND PROPERTY INCLUDE_DIRECTORIES ${ALSA_INCLUDE_DIRS})
+    SET_PROPERTY(TARGET openal APPEND PROPERTY INCLUDE_DIRECTORIES ${ALSA_INCLUDE_DIRS})
 ENDIF()
 IF(HAVE_OSS)
-    SET_PROPERTY(TARGET ${LIBNAME} APPEND PROPERTY INCLUDE_DIRECTORIES ${OSS_INCLUDE_DIRS})
+    SET_PROPERTY(TARGET openal APPEND PROPERTY INCLUDE_DIRECTORIES ${OSS_INCLUDE_DIRS})
 ENDIF()
 IF(HAVE_SOLARIS)
-    SET_PROPERTY(TARGET ${LIBNAME} APPEND PROPERTY INCLUDE_DIRECTORIES ${AUDIOIO_INCLUDE_DIRS})
+    SET_PROPERTY(TARGET openal APPEND PROPERTY INCLUDE_DIRECTORIES ${AUDIOIO_INCLUDE_DIRS})
 ENDIF()
 IF(HAVE_SNDIO)
-    SET_PROPERTY(TARGET ${LIBNAME} APPEND PROPERTY INCLUDE_DIRECTORIES ${SOUNDIO_INCLUDE_DIRS})
+    SET_PROPERTY(TARGET openal APPEND PROPERTY INCLUDE_DIRECTORIES ${SOUNDIO_INCLUDE_DIRS})
 ENDIF()
 IF(HAVE_QSA)
-    SET_PROPERTY(TARGET ${LIBNAME} APPEND PROPERTY INCLUDE_DIRECTORIES ${QSA_INCLUDE_DIRS})
+    SET_PROPERTY(TARGET openal APPEND PROPERTY INCLUDE_DIRECTORIES ${QSA_INCLUDE_DIRS})
 ENDIF()
 IF(HAVE_DSOUND)
-    SET_PROPERTY(TARGET ${LIBNAME} APPEND PROPERTY INCLUDE_DIRECTORIES ${DSOUND_INCLUDE_DIRS})
+    SET_PROPERTY(TARGET openal APPEND PROPERTY INCLUDE_DIRECTORIES ${DSOUND_INCLUDE_DIRS})
 ENDIF()
 IF(HAVE_PORTAUDIO)
-    SET_PROPERTY(TARGET ${LIBNAME} APPEND PROPERTY INCLUDE_DIRECTORIES ${PORTAUDIO_INCLUDE_DIRS})
+    SET_PROPERTY(TARGET openal APPEND PROPERTY INCLUDE_DIRECTORIES ${PORTAUDIO_INCLUDE_DIRS})
 ENDIF()
 IF(HAVE_PULSEAUDIO)
-    SET_PROPERTY(TARGET ${LIBNAME} APPEND PROPERTY INCLUDE_DIRECTORIES ${PULSEAUDIO_INCLUDE_DIRS})
+    SET_PROPERTY(TARGET openal APPEND PROPERTY INCLUDE_DIRECTORIES ${PULSEAUDIO_INCLUDE_DIRS})
 ENDIF()
 IF(HAVE_JACK)
-    SET_PROPERTY(TARGET ${LIBNAME} APPEND PROPERTY INCLUDE_DIRECTORIES ${JACK_INCLUDE_DIRS})
+    SET_PROPERTY(TARGET openal APPEND PROPERTY INCLUDE_DIRECTORIES ${JACK_INCLUDE_DIRS})
 ENDIF()
 IF(WIN32)
     IF(MSVC)
-        SET_PROPERTY(TARGET ${LIBNAME} APPEND_STRING PROPERTY LINK_FLAGS " /SUBSYSTEM:WINDOWS")
+        SET_PROPERTY(TARGET openal APPEND_STRING PROPERTY LINK_FLAGS " /SUBSYSTEM:WINDOWS")
     ELSEIF(CMAKE_COMPILER_IS_GNUCC)
-        SET_PROPERTY(TARGET ${LIBNAME} APPEND_STRING PROPERTY LINK_FLAGS " -mwindows")
+        SET_PROPERTY(TARGET openal APPEND_STRING PROPERTY LINK_FLAGS " -mwindows")
     ENDIF()
 ENDIF()
 
-SET_TARGET_PROPERTIES(${LIBNAME} PROPERTIES VERSION ${LIB_VERSION}
-                                            SOVERSION ${LIB_MAJOR_VERSION})
-IF(WIN32 AND NOT LIBTYPE STREQUAL "STATIC")
-    SET_TARGET_PROPERTIES(${LIBNAME} PROPERTIES PREFIX "")
+SET_TARGET_PROPERTIES(openal PROPERTIES VERSION ${LIB_VERSION}
+                                        SOVERSION ${LIB_MAJOR_VERSION})
+IF(WIN32)
+    SET_TARGET_PROPERTIES(openal PROPERTIES OUTPUT_NAME "OpenAL32")
+ENDIF()
+
+if(WIN32 AND NOT LIBTYPE STREQUAL "STATIC")
+    SET_TARGET_PROPERTIES(openal PROPERTIES PREFIX "")
 
     IF(MINGW AND ALSOFT_BUILD_IMPORT_LIB)
         FIND_PROGRAM(SED_EXECUTABLE NAMES sed DOC "sed executable")
@@ -1311,25 +1312,25 @@ IF(WIN32 AND NOT LIBTYPE STREQUAL "STATIC")
                 MESSAGE(STATUS "WARNING: Cannot find dlltool, disabling .def/.lib generation")
             ENDIF()
         ELSE()
-            SET_PROPERTY(TARGET ${LIBNAME} APPEND_STRING PROPERTY LINK_FLAGS " -Wl,--output-def,${LIBNAME}.def")
-            ADD_CUSTOM_COMMAND(TARGET ${LIBNAME} POST_BUILD
-                COMMAND "${SED_EXECUTABLE}" -i -e "s/ @[^ ]*//" ${LIBNAME}.def
-                COMMAND "${DLLTOOL_EXECUTABLE}" -d ${LIBNAME}.def -l ${LIBNAME}.lib -D ${LIBNAME}.dll
-                COMMENT "Stripping ordinals from ${LIBNAME}.def and generating ${LIBNAME}.lib..."
+            SET_PROPERTY(TARGET openal APPEND_STRING PROPERTY LINK_FLAGS " -Wl,--output-def,OpenAL32.def")
+            ADD_CUSTOM_COMMAND(TARGET openal POST_BUILD
+                COMMAND "${SED_EXECUTABLE}" -i -e "s/ @[^ ]*//" OpenAL32.def
+                COMMAND "${DLLTOOL_EXECUTABLE}" -d OpenAL32.def -l OpenAL32.lib -D OpenAL32.dll
+                COMMENT "Stripping ordinals from OpenAL32.def and generating OpenAL32.lib..."
                 VERBATIM
             )
         ENDIF()
     ENDIF()
 ENDIF()
 
-TARGET_LINK_LIBRARIES(${LIBNAME} common ${EXTRA_LIBS})
+TARGET_LINK_LIBRARIES(openal common ${EXTRA_LIBS})
 IF(TARGET build_version)
-    ADD_DEPENDENCIES(${LIBNAME} build_version)
+    ADD_DEPENDENCIES(openal build_version)
 ENDIF()
 
 IF(ALSOFT_INSTALL)
     # Add an install target here
-    INSTALL(TARGETS ${LIBNAME}
+    INSTALL(TARGETS openal
             RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
             LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
             ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
@@ -1404,7 +1405,7 @@ ENDIF()
 IF(ALSOFT_UTILS)
     ADD_EXECUTABLE(openal-info utils/openal-info.c)
     SET_PROPERTY(TARGET openal-info APPEND PROPERTY COMPILE_FLAGS ${EXTRA_CFLAGS})
-    TARGET_LINK_LIBRARIES(openal-info ${LIBNAME})
+    TARGET_LINK_LIBRARIES(openal-info openal)
 
     ADD_EXECUTABLE(makehrtf utils/makehrtf.c)
     SET_PROPERTY(TARGET makehrtf APPEND PROPERTY COMPILE_FLAGS ${EXTRA_CFLAGS})
@@ -1438,7 +1439,7 @@ IF(ALSOFT_TESTS)
     SET_PROPERTY(TARGET test-common APPEND PROPERTY COMPILE_FLAGS ${EXTRA_CFLAGS})
 
     ADD_EXECUTABLE(altonegen examples/altonegen.c)
-    TARGET_LINK_LIBRARIES(altonegen test-common ${LIBNAME})
+    TARGET_LINK_LIBRARIES(altonegen test-common openal)
     SET_PROPERTY(TARGET altonegen APPEND PROPERTY COMPILE_FLAGS ${EXTRA_CFLAGS})
 
     IF(ALSOFT_INSTALL)
@@ -1465,7 +1466,7 @@ IF(ALSOFT_EXAMPLES)
 
             ADD_EXECUTABLE(alstream examples/alstream.c)
             TARGET_LINK_LIBRARIES(alstream ex-common ${SDL_SOUND_LIBRARIES} ${SDL2_LIBRARY}
-                                           common ${LIBNAME})
+                                           common openal)
             SET_PROPERTY(TARGET alstream APPEND PROPERTY COMPILE_FLAGS ${EXTRA_CFLAGS})
             SET_PROPERTY(TARGET alstream APPEND PROPERTY
                 INCLUDE_DIRECTORIES ${SDL2_INCLUDE_DIR} ${SDL_SOUND_INCLUDE_DIR}
@@ -1473,7 +1474,7 @@ IF(ALSOFT_EXAMPLES)
 
             ADD_EXECUTABLE(alreverb examples/alreverb.c)
             TARGET_LINK_LIBRARIES(alreverb ex-common ${SDL_SOUND_LIBRARIES} ${SDL2_LIBRARY}
-                                           common ${LIBNAME})
+                                           common openal)
             SET_PROPERTY(TARGET alreverb APPEND PROPERTY COMPILE_FLAGS ${EXTRA_CFLAGS})
             SET_PROPERTY(TARGET alreverb APPEND PROPERTY
                 INCLUDE_DIRECTORIES ${SDL2_INCLUDE_DIR} ${SDL_SOUND_INCLUDE_DIR}
@@ -1481,7 +1482,7 @@ IF(ALSOFT_EXAMPLES)
 
             ADD_EXECUTABLE(allatency examples/allatency.c)
             TARGET_LINK_LIBRARIES(allatency ex-common ${SDL_SOUND_LIBRARIES} ${SDL2_LIBRARY}
-                                            common ${LIBNAME})
+                                            common openal)
             SET_PROPERTY(TARGET allatency APPEND PROPERTY COMPILE_FLAGS ${EXTRA_CFLAGS})
             SET_PROPERTY(TARGET allatency APPEND PROPERTY
                 INCLUDE_DIRECTORIES ${SDL2_INCLUDE_DIR} ${SDL_SOUND_INCLUDE_DIR}
@@ -1489,7 +1490,7 @@ IF(ALSOFT_EXAMPLES)
 
             ADD_EXECUTABLE(alloopback examples/alloopback.c)
             TARGET_LINK_LIBRARIES(alloopback ex-common ${SDL_SOUND_LIBRARIES} ${SDL2_LIBRARY}
-                                             common ${LIBNAME})
+                                             common openal)
             SET_PROPERTY(TARGET alloopback APPEND PROPERTY COMPILE_FLAGS ${EXTRA_CFLAGS})
             SET_PROPERTY(TARGET alloopback APPEND PROPERTY
                 INCLUDE_DIRECTORIES ${SDL2_INCLUDE_DIR} ${SDL_SOUND_INCLUDE_DIR}
@@ -1497,7 +1498,7 @@ IF(ALSOFT_EXAMPLES)
 
             ADD_EXECUTABLE(alhrtf examples/alhrtf.c)
             TARGET_LINK_LIBRARIES(alhrtf ex-common ${SDL_SOUND_LIBRARIES} ${SDL2_LIBRARY}
-                                         common ${LIBNAME})
+                                         common openal)
             SET_PROPERTY(TARGET alhrtf APPEND PROPERTY COMPILE_FLAGS ${EXTRA_CFLAGS})
             SET_PROPERTY(TARGET alhrtf APPEND PROPERTY
                 INCLUDE_DIRECTORIES ${SDL2_INCLUDE_DIR} ${SDL_SOUND_INCLUDE_DIR}
@@ -1540,7 +1541,7 @@ IF(ALSOFT_EXAMPLES)
         ENDIF()
         IF(FFVER_OK AND NOT MSVC)
             ADD_EXECUTABLE(alffplay examples/alffplay.c)
-            TARGET_LINK_LIBRARIES(alffplay common ${SDL2_LIBRARY} ${LIBNAME} ${FFMPEG_LIBRARIES})
+            TARGET_LINK_LIBRARIES(alffplay common ${SDL2_LIBRARY} openal ${FFMPEG_LIBRARIES})
             SET_PROPERTY(TARGET alffplay APPEND PROPERTY COMPILE_FLAGS ${EXTRA_CFLAGS})
             SET_PROPERTY(TARGET alffplay APPEND PROPERTY
                 INCLUDE_DIRECTORIES ${SDL2_INCLUDE_DIR} ${FFMPEG_INCLUDE_DIRS}