From a85efd04631549fe76b3835933f6d61b81cef64a Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Sat, 26 Oct 2019 14:29:51 +0100 Subject: [PATCH] Don't name executable with architecture. --- CMakeLists.txt | 2 +- linux/CMakeLists.txt | 6 +++--- wii/CMakeLists.txt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 480677e..8e2c091 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ set(CMAKE_C_STANDARD 90) set(MAIN_SOURCES main.c list_devices.c device.c scsi.c hex2bin.c usb.c ieee1394.c pcmcia.c ata.c sdhci.c worker.c endian.h) -add_library(dicremote ${MAIN_SOURCES}) +add_library(dicremotecore ${MAIN_SOURCES}) CHECK_INCLUDE_FILES("endian.h" HAVE_ENDIAN_H) CHECK_INCLUDE_FILES("sys/endian.h" HAVE_SYS_ENDIAN_H) diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt index fdbaeab..1c07486 100644 --- a/linux/CMakeLists.txt +++ b/linux/CMakeLists.txt @@ -9,10 +9,10 @@ set(PLATFORM_SOURCES list_devices.c linux.h device.c scsi.c usb.c ieee1394.c pcm CHECK_LIBRARY_EXISTS("udev" udev_new "" HAS_UDEV) CHECK_INCLUDE_FILES("linux/mmc/ioctl.h" HAVE_MMC_IOCTL_H) -add_executable(dicremote-${CMAKE_SYSTEM_PROCESSOR} ${PLATFORM_SOURCES}) +add_executable(dicremote ${PLATFORM_SOURCES}) if (HAS_UDEV) - target_link_libraries(dicremote-${CMAKE_SYSTEM_PROCESSOR} udev) + target_link_libraries(dicremote udev) add_definitions(-DHAS_UDEV) endif () @@ -20,4 +20,4 @@ if (HAVE_MMC_IOCTL_H) add_definitions(-DHAS_UAPI_MMC) endif () -target_link_libraries(dicremote-${CMAKE_SYSTEM_PROCESSOR} dicremote) \ No newline at end of file +target_link_libraries(dicremote dicremotecore) \ No newline at end of file diff --git a/wii/CMakeLists.txt b/wii/CMakeLists.txt index 26a6d2a..96a4e24 100644 --- a/wii/CMakeLists.txt +++ b/wii/CMakeLists.txt @@ -9,4 +9,4 @@ set(PLATFORM_SOURCES wii.c hello.c network.c wii.h list_devices.c) add_executable(dicremote-wii ${PLATFORM_SOURCES}) set_target_properties(dicremote-wii PROPERTIES LINK_FLAGS -L$ENV{DEVKITPRO}/libogc/lib/wii/) set_target_properties(dicremote-wii PROPERTIES OUTPUT_NAME dicremote.elf) -target_link_libraries(dicremote-wii dicremote -lwiiuse -lbte -logc -lm) \ No newline at end of file +target_link_libraries(dicremote-wii dicremotecore -lwiiuse -lbte -logc -lm) \ No newline at end of file