Skip to content

Commit 80b8c60

Browse files
committed
Update CLI config tool, add Windows version
1 parent 72f0cd3 commit 80b8c60

5 files changed

Lines changed: 13 additions & 7 deletions

File tree

examples/config-tool/cfg_usbsid

256 Bytes
Binary file not shown.

examples/config-tool/cfg_usbsid.c

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,14 @@
4343
#include "macros.h"
4444

4545
/* Compile with:
46-
* gcc -g3 -L/usr/local/lib inih/ini.c cfg_usbsid.c -o cfg_usbsid $(pkg-config --libs --cflags libusb-1.0)
46+
* gcc -g3 -L/usr/local/lib inih/ini.c cfg_usbsid.c -o cfg_usbsid $(pkg-config --libs --cflags libusb-1.0) -I./examples/config-tool/ini
4747
* gcc -g3 -L/usr/local/lib examples/config-tool/inih/ini.c examples/config-tool/cfg_usbsid.c -o examples/config-tool/cfg_usbsid $(pkg-config --libs --cflags libusb-1.0) -I./examples/config-tool/inih ; cp examples/config-tool/cfg_usbsid ~/.local/bin
48+
* /usr/bin/x86_64-w64-mingw32-gcc -g3 \
49+
-L/usr/x86_64-w64-mingw32/sys-root/mingw/lib \
50+
inih/ini.c cfg_usbsid.c -o cfg_usbsid.exe \
51+
-lusb-1.0 \
52+
-I/usr/x86_64-w64-mingw32/sys-root/mingw/include/libusb-1.0
53+
-I./examples/config-tool/inih
4854
*/
4955

5056
/* ---------------------- */
@@ -695,7 +701,7 @@ void print_config(void)
695701
truefalse[(int)usbsid_config.lock_clockrate]);
696702
printf("[CONFIG] [SOCKET ONE] %s as %s\n",
697703
enabled[(int)usbsid_config.socketOne.enabled],
698-
socket[(int)usbsid_config.socketOne.dualsid]);
704+
us_socket[(int)usbsid_config.socketOne.dualsid]);
699705
printf("[CONFIG] [SOCKET ONE] CHIP TYPE: %s, CLONE TYPE: %s\n",
700706
chiptypes[usbsid_config.socketOne.chiptype],
701707
clonetypes[usbsid_config.socketOne.clonetype]);
@@ -704,7 +710,7 @@ void print_config(void)
704710
sidtypes[usbsid_config.socketOne.sid2type]);
705711
printf("[CONFIG] [SOCKET TWO] %s as %s\n",
706712
enabled[(int)usbsid_config.socketTwo.enabled],
707-
socket[(int)usbsid_config.socketTwo.dualsid]);
713+
us_socket[(int)usbsid_config.socketTwo.dualsid]);
708714
printf("[CONFIG] [SOCKET TWO] CHIP TYPE: %s, CLONE TYPE: %s\n",
709715
chiptypes[usbsid_config.socketTwo.chiptype],
710716
clonetypes[usbsid_config.socketTwo.clonetype]);
@@ -968,7 +974,7 @@ void print_socket_config(void)
968974

969975
printf("[CONFIG] [SOCKET ONE] %s as %s\n",
970976
enabled[usbsid_config.socketOne.enabled],
971-
socket[usbsid_config.socketOne.dualsid]);
977+
us_socket[usbsid_config.socketOne.dualsid]);
972978
printf("[CONFIG] [SOCKET ONE] CHIP TYPE: %s, CLONE TYPE: %s\n",
973979
chiptypes[usbsid_config.socketOne.chiptype],
974980
clonetypes[usbsid_config.socketOne.clonetype]);
@@ -977,7 +983,7 @@ void print_socket_config(void)
977983
sidtypes[usbsid_config.socketOne.sid2type]);
978984
printf("[CONFIG] [SOCKET TWO] %s as %s\n",
979985
enabled[usbsid_config.socketTwo.enabled],
980-
socket[usbsid_config.socketTwo.dualsid]);
986+
us_socket[usbsid_config.socketTwo.dualsid]);
981987
printf("[CONFIG] [SOCKET TWO] CHIP TYPE: %s, CLONE TYPE: %s\n",
982988
chiptypes[usbsid_config.socketTwo.chiptype],
983989
clonetypes[usbsid_config.socketTwo.clonetype]);
1.61 MB
Binary file not shown.

examples/config-tool/cfg_usbsid.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ const char * enabled[] = {"Disabled", "Enabled"};
156156
const char * intext[] = { "Internal", "External" };
157157
const char * onoff[] = {"Off", "On"};
158158
const char * truefalse[] = {"False", "True"};
159-
const char * socket[] = { "Single SID", "Dual SID" };
159+
const char * us_socket[] = { "Single SID", "Dual SID" };
160160
const char * chiptypes[] = {"Real", "Clone", "Unknown"};
161161
const char * sidtypes[] = {"Unknown", "N/A", "MOS8580", "MOS6581", "FMopl"};
162162
const char * clonetypes[] = { "Disabled", "Other", "SKPico", "ARMSID", "FPGASID", "RedipSID" };

0 commit comments

Comments
 (0)