Skip to content

Binaries for pull request #20419 on cocos2d-x #394

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: v4
Choose a base branch
from
Open

Binaries for pull request #20419 on cocos2d-x #394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d1f0ce5
move win32-specific MP3Decoder, OggDecoder, OpenalSoft to external ro…
Mjarkiew Dec 19, 2019
3e40dc9
replace libs built on arch linux with libs built on Ubuntu 18.04
Mjarkiew Dec 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,13 +121,6 @@ if(NOT LINUX)
ext_png
)
endif(NOT LINUX)

if(LINUX)
add_subdirectory(linux-specific/fmod)
target_link_libraries(external
ext_fmod
)
endif()

if(ANDROID)
add_subdirectory(android-specific/cpufeatures)
Expand All @@ -143,12 +136,17 @@ endif()
if(WINDOWS)
add_subdirectory(win32-specific/gles)
add_subdirectory(win32-specific/icon)
add_subdirectory(win32-specific/MP3Decoder)
add_subdirectory(win32-specific/OggDecoder)
add_subdirectory(win32-specific/OpenalSoft)
target_link_libraries(external
ext_gles
ext_icon
)
endif()

if(WINDOWS OR LINUX)
add_subdirectory(MP3Decoder)
add_subdirectory(OggDecoder)
add_subdirectory(OpenalSoft)
target_link_libraries(external
ext_MP3Decoder
ext_OggDecoder
ext_OpenalSoft
Expand Down
29 changes: 29 additions & 0 deletions MP3Decoder/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
cmake_minimum_required(VERSION 3.6)

set(lib_name MP3Decoder)
set(target_name ext_${lib_name})

project(${lib_name})

include(../cmake/CocosExternalConfig.cmake)

if(WINDOWS)
add_library(${target_name} SHARED IMPORTED GLOBAL)
elseif(LINUX)
add_library(${target_name} STATIC IMPORTED GLOBAL)
endif()

set_target_properties(${target_name} PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR}/include
)

if(WINDOWS)
set_target_properties(${target_name} PROPERTIES
IMPORTED_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/prebuilt/win32/libmpg123.dll"
IMPORTED_IMPLIB "${CMAKE_CURRENT_SOURCE_DIR}/prebuilt/win32/libmpg123.lib"
)
elseif(LINUX)
set_target_properties(${target_name} PROPERTIES
IMPORTED_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/prebuilt/linux/64-bit/libmpg123.a"
)
endif()
0 win32-specific/MP3Decoder/include/mpg123.h → MP3Decoder/include/mpg123.h
View file
Open in desktop
File renamed without changes.
Binary file added MP3Decoder/prebuilt/linux/64-bit/libmpg123.a
View file
Open in desktop
Binary file not shown.
0 ...pecific/MP3Decoder/prebuilt/libmpg123.dll → MP3Decoder/prebuilt/win32/libmpg123.dll
View file
Open in desktop
File renamed without changes.
0 ...pecific/MP3Decoder/prebuilt/libmpg123.lib → MP3Decoder/prebuilt/win32/libmpg123.lib
View file
Open in desktop
File renamed without changes.
70 changes: 70 additions & 0 deletions OggDecoder/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
cmake_minimum_required(VERSION 3.6)

set(lib_name OggDecoder)
set(target_name ext_${lib_name})

project(${lib_name})

include(../cmake/CocosExternalConfig.cmake)

if(WINDOWS)
add_library(${target_name} SHARED IMPORTED GLOBAL)
elseif(LINUX)
add_library(${target_name} STATIC IMPORTED GLOBAL)
endif()

set_target_properties(${target_name} PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR}/include
)

if(WINDOWS)
set_target_properties(${target_name} PROPERTIES
IMPORTED_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/prebuilt/win32/libogg.dll"
IMPORTED_IMPLIB "${CMAKE_CURRENT_SOURCE_DIR}/prebuilt/win32/libogg.lib"
)
elseif(LINUX)
set_target_properties(${target_name} PROPERTIES
IMPORTED_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/prebuilt/linux/64-bit/libogg.a"
)
endif()

# internal link depend
if(WINDOWS)
set_property(TARGET ${target_name} APPEND PROPERTY
INTERFACE_LINK_LIBRARIES "${CMAKE_CURRENT_SOURCE_DIR}/prebuilt/win32/libvorbis.lib"
)
set_property(TARGET ${target_name} APPEND PROPERTY
IMPORTED_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/prebuilt/win32/libvorbis.dll"
)
set_property(TARGET ${target_name} APPEND PROPERTY
INTERFACE_LINK_LIBRARIES "${CMAKE_CURRENT_SOURCE_DIR}/prebuilt/win32/libvorbisfile.lib"
)
set_property(TARGET ${target_name} APPEND PROPERTY
IMPORTED_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/prebuilt/win32/libvorbisfile.dll"
)

elseif(LINUX)
add_library(ogg STATIC IMPORTED)
set_target_properties(ogg PROPERTIES
IMPORTED_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/prebuilt/linux/64-bit/libogg.a"
)
add_library(vorbis STATIC IMPORTED)
set_target_properties(vorbis PROPERTIES
IMPORTED_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/prebuilt/linux/64-bit/libvorbis.a"
)
add_library(vorbisfile STATIC IMPORTED)
set_target_properties(vorbisfile PROPERTIES
IMPORTED_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/prebuilt/linux/64-bit/libvorbisfile.a"
)

set_property(TARGET vorbis APPEND PROPERTY INTERFACE_LINK_LIBRARIES "ogg")
set_property(TARGET vorbis APPEND PROPERTY INTERFACE_LINK_LIBRARIES "vorbisfile")

set_property(TARGET vorbisfile APPEND PROPERTY INTERFACE_LINK_LIBRARIES "ogg")
set_property(TARGET vorbisfile APPEND PROPERTY INTERFACE_LINK_LIBRARIES "vorbis")

set_property(TARGET ${target_name} APPEND PROPERTY
INTERFACE_LINK_LIBRARIES "vorbis"
)
endif()

0 win32-specific/OggDecoder/include/ogg/ogg.h → OggDecoder/include/ogg/ogg.h
View file
Open in desktop
File renamed without changes.
0 ...pecific/OggDecoder/include/ogg/os_types.h → OggDecoder/include/ogg/os_types.h
View file
Open in desktop
File renamed without changes.
0 ...pecific/OggDecoder/include/vorbis/codec.h → OggDecoder/include/vorbis/codec.h
View file
Open in desktop
File renamed without changes.
0 ...fic/OggDecoder/include/vorbis/vorbisenc.h → OggDecoder/include/vorbis/vorbisenc.h
View file
Open in desktop
File renamed without changes.
0 ...ic/OggDecoder/include/vorbis/vorbisfile.h → OggDecoder/include/vorbis/vorbisfile.h
View file
Open in desktop
File renamed without changes.
Binary file added OggDecoder/prebuilt/linux/64-bit/libogg.a
View file
Open in desktop
Binary file not shown.
Binary file added OggDecoder/prebuilt/linux/64-bit/libvorbis.a
View file
Open in desktop
Binary file not shown.
Binary file added OggDecoder/prebuilt/linux/64-bit/libvorbisfile.a
View file
Open in desktop
Binary file not shown.
0 ...2-specific/OggDecoder/prebuilt/libogg.dll → OggDecoder/prebuilt/win32/libogg.dll
View file
Open in desktop
File renamed without changes.
0 ...2-specific/OggDecoder/prebuilt/libogg.lib → OggDecoder/prebuilt/win32/libogg.lib
View file
Open in desktop
File renamed without changes.
0 ...pecific/OggDecoder/prebuilt/libvorbis.dll → OggDecoder/prebuilt/win32/libvorbis.dll
View file
Open in desktop
File renamed without changes.
0 ...pecific/OggDecoder/prebuilt/libvorbis.lib → OggDecoder/prebuilt/win32/libvorbis.lib
View file
Open in desktop
File renamed without changes.
0 ...fic/OggDecoder/prebuilt/libvorbisfile.dll → OggDecoder/prebuilt/win32/libvorbisfile.dll
View file
Open in desktop
File renamed without changes.
0 ...fic/OggDecoder/prebuilt/libvorbisfile.lib → OggDecoder/prebuilt/win32/libvorbisfile.lib
View file
Open in desktop
File renamed without changes.
29 changes: 29 additions & 0 deletions OpenalSoft/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
cmake_minimum_required(VERSION 3.6)

set(lib_name OpenalSoft)
set(target_name ext_${lib_name})

project(${lib_name})

include(../cmake/CocosExternalConfig.cmake)

add_library(${target_name} SHARED IMPORTED GLOBAL)

if(WINDOWS)
set_target_properties(${target_name} PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR}/include/win32
)
set_target_properties(${target_name} PROPERTIES
IMPORTED_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/prebuilt/win32/OpenAL32.dll"
IMPORTED_IMPLIB "${CMAKE_CURRENT_SOURCE_DIR}/prebuilt/win32/OpenAL32.lib"
)
elseif(LINUX)
set_target_properties(${target_name} PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR}/include/linux
)
set_target_properties(${target_name} PROPERTIES
IMPORTED_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/prebuilt/linux/64-bit/libopenal.so"
)
endif()


0 win32-specific/OpenalSoft/include/AL/al.h → OpenalSoft/include/linux/AL/al.h
View file
Open in desktop
File renamed without changes.
0 win32-specific/OpenalSoft/include/AL/alc.h → OpenalSoft/include/linux/AL/alc.h
View file
Open in desktop
File renamed without changes.
Loading