cnelson/friidump
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix error: multiple definition of `disctype'; CMakeFiles/friidumplib.dir/disc.c.o:(.bss+0x0): first defined here

Browse source 
collect2: error: ld returned 1 exit status

https://github.com/bradenmcd/friidump/issues/10
This commit is contained in:
Michael Henke 2023-01-27 15:54:07 -08:00
parent d9461a9401
commit 8160dc371e
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
libfriidump/unscrambler.c
View file

@ -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. * 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 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<EFBFBD>oz (xt5@ingenieria-inversa.cl), GPL v2+,
* http://www.ingenieria-inversa.cl/?lp_lang_pref=en . * 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 */ /*! \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 */ #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 /*! \brief A structure that represents a seed
*/ */

2
libfriidump/unscrambler.h
View file

@ -31,8 +31,6 @@ typedef struct unscrambler_s unscrambler;
the progress function the same format we use elsewhere */ 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); 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 unscrambler *unscrambler_new (void);
FRIIDUMPLIB_EXPORT void *unscrambler_destroy (unscrambler *u); 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); FRIIDUMPLIB_EXPORT bool unscrambler_unscramble_16sectors (unscrambler *u, u_int32_t sector_no, u_int8_t *inbuf, u_int8_t *outbuf);