From 8160dc371e2a340c892e63db131e43c0a43adb4a Mon Sep 17 00:00:00 2001 From: Michael Henke Date: Fri, 27 Jan 2023 15:54:07 -0800 Subject: [PATCH] Fix error: multiple definition of `disctype'; CMakeFiles/friidumplib.dir/disc.c.o:(.bss+0x0): first defined here collect2: error: ld returned 1 exit status https://github.com/bradenmcd/friidump/issues/10 --- libfriidump/unscrambler.c | 3 ++- libfriidump/unscrambler.h | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libfriidump/unscrambler.c b/libfriidump/unscrambler.c index 2198ee9..fba0730 100644 --- a/libfriidump/unscrambler.c +++ b/libfriidump/unscrambler.c @@ -25,7 +25,7 @@ * As Nintendo GameCube/Wii discs use the standars DVD-ROM scrambling algorithm, but with different, unknown, seeds, the actual seeds have to be brute-forced. * The functions in this file take care of the brute-forcing and of the actual unscrambling of the read sectors. * - * The code in this file has been derived from unscrambler 0.4, Copyright (C) 2006 Victor Muñoz (xt5@ingenieria-inversa.cl), GPL v2+, + * The code in this file has been derived from unscrambler 0.4, Copyright (C) 2006 Victor Mu�oz (xt5@ingenieria-inversa.cl), GPL v2+, * http://www.ingenieria-inversa.cl/?lp_lang_pref=en . */ @@ -48,6 +48,7 @@ /*! \brief Number of bytes of a sector on which the EDC is calculated */ #define EDC_LENGTH (RAW_SECTOR_SIZE - 4) /* The EDC value is contained in the bottom 4 bytes of a frame */ +u_int8_t disctype; /*! \brief A structure that represents a seed */ diff --git a/libfriidump/unscrambler.h b/libfriidump/unscrambler.h index b7f3da6..4c2209f 100644 --- a/libfriidump/unscrambler.h +++ b/libfriidump/unscrambler.h @@ -31,8 +31,6 @@ typedef struct unscrambler_s unscrambler; the progress function the same format we use elsewhere */ typedef void (*unscrambler_progress_func) (bool start, u_int32_t current_sector, u_int32_t total_sectors, void *progress_data); -u_int8_t disctype; - FRIIDUMPLIB_EXPORT unscrambler *unscrambler_new (void); FRIIDUMPLIB_EXPORT void *unscrambler_destroy (unscrambler *u); FRIIDUMPLIB_EXPORT bool unscrambler_unscramble_16sectors (unscrambler *u, u_int32_t sector_no, u_int8_t *inbuf, u_int8_t *outbuf);