mirror of
https://github.com/vgmstream/vgmstream.git
synced 2024-11-12 01:30:49 +01:00
Merge pull request #376 from CyberBotX/CMake
Some CMake and vgmstream123 fixes.
This commit is contained in:
commit
d7d838ab49
@ -181,7 +181,7 @@ if(WIN32)
|
||||
add_subdirectory(ext_libs)
|
||||
if(BUILD_WINAMP)
|
||||
if(NOT WINAMP_INSTALL_PREFIX)
|
||||
message(FATAL_ERROR "The path to Winamp must be set. (Use WINAMP_INSTALL_PREFIX, the plugin will be installed into the Plugins directory)")
|
||||
set(WINAMP_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}/winamp)
|
||||
endif()
|
||||
add_subdirectory(winamp)
|
||||
endif()
|
||||
@ -193,7 +193,7 @@ if(WIN32)
|
||||
message(FATAL_ERROR "The path to the WTL include directory must be set. (Use WTL_INCLUDE_PATH)")
|
||||
endif()
|
||||
if(NOT FB2K_COMPONENT_INSTALL_PREFIX)
|
||||
message(FATAL_ERROR "The path to foobar2000 must be set. (Use FB2K_COMPONENT_INSTALL_PREFIX, this is where the component will be installed)")
|
||||
set(FB2K_COMPONENT_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}/fb2k)
|
||||
endif()
|
||||
include_external_msproject(fb2k_sdk ${FB2K_SDK_PATH}/foobar2000/SDK/foobar2000_SDK.vcxproj)
|
||||
include_external_msproject(fb2k_sdk_helpers ${FB2K_SDK_PATH}/foobar2000/helpers/foobar2000_sdk_helpers.vcxproj)
|
||||
@ -204,7 +204,7 @@ if(WIN32)
|
||||
endif()
|
||||
if(BUILD_XMPLAY)
|
||||
if(NOT XMPLAY_INSTALL_PREFIX)
|
||||
message(FATAL_ERROR "The path to XMPlay must be set. (Use XMPlay_INSTALL_PREFIX, this is where the plugin will be installed)")
|
||||
set(XMPLAY_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}/xmplay)
|
||||
endif()
|
||||
add_subdirectory(xmplay)
|
||||
endif()
|
||||
|
@ -639,12 +639,6 @@ int main(int argc, char **argv) {
|
||||
|
||||
while ((opt = getopt(argc, argv, "-D:F:L:M:S:b:d:f:o:@:hrv")) != -1) {
|
||||
switch (opt) {
|
||||
case 1:
|
||||
if (play_file(optarg, &par)) {
|
||||
status = 1;
|
||||
goto done;
|
||||
}
|
||||
break;
|
||||
case '@':
|
||||
if (play_playlist(optarg, &par)) {
|
||||
status = 1;
|
||||
@ -698,6 +692,15 @@ int main(int argc, char **argv) {
|
||||
goto done;
|
||||
}
|
||||
}
|
||||
argc -= optind;
|
||||
argv += optind;
|
||||
|
||||
for (opt = 0; opt < argc; ++opt) {
|
||||
if (play_file(argv[opt], &par)) {
|
||||
status = 1;
|
||||
goto done;
|
||||
}
|
||||
}
|
||||
|
||||
if (repeat) {
|
||||
optind = 0;
|
||||
|
@ -18,6 +18,10 @@ macro(setup_target TARGET)
|
||||
# Set up position-independent code for all targets
|
||||
set_target_properties(${TARGET} PROPERTIES
|
||||
POSITION_INDEPENDENT_CODE TRUE)
|
||||
if(NOT WIN32 AND LINK)
|
||||
# Include libm on non-Windows systems
|
||||
target_link_libraries(${TARGET} m)
|
||||
endif()
|
||||
|
||||
if(USE_FDKAAC)
|
||||
target_compile_definitions(${TARGET} PRIVATE
|
||||
|
@ -152,7 +152,7 @@ If building the Winamp plugin, the following path is required:
|
||||
|
||||
If building the XMPlay plugin, the following path is required:
|
||||
|
||||
- **XMPLAY_INSTALL_PLUGIN**: The path to the XMPlay installation. The required DLLs and the plugin will be installed in this directory.
|
||||
- **XMPLAY_INSTALL_PREFIX**: The path to the XMPlay installation. The required DLLs and the plugin will be installed in this directory.
|
||||
|
||||
If building the Audacious plugin, no path needs to be given, it will be found by CMake.
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user