mirror/86Box-probing-tools
1
0
Fork 0
mirror of https://github.com/86Box/probing-tools.git synced 2026-02-22 01:25:35 -07:00
Code Issues Packages Projects Releases Wiki Activity

pcireg: Add cp437 conversion to Windows target

Browse Source
This commit is contained in:
RichardG867
2024-10-23 15:41:29 -03:00
parent 73faeb9b07
commit 86cc9b337e
5 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/build.yml vendored
View File

@@ -63,8 +63,8 @@ jobs:
cd ${{ github.workspace }}/pcireg
wmake
make -f Makefile.uefi ARCH=x86_64
make -f Makefile.gcc clean all CC=i686-w64-mingw32-gcc CFLAGS=-I/usr/local/include LDFLAGS=-static LDAPPEND=-lcfgmgr32 DEST=pciregw
make -f Makefile.gcc clean all CC=x86_64-w64-mingw32-gcc CFLAGS=-I/usr/local/include LDFLAGS=-static LDAPPEND=-lcfgmgr32 DEST=pciregw64
make -f Makefile.gcc clean all CC=i686-w64-mingw32-gcc CFLAGS=-I/usr/local/include LDFLAGS=-static LDAPPEND=-lcfgmgr32 CP437_CONV=y DEST=pciregw
make -f Makefile.gcc clean all CC=x86_64-w64-mingw32-gcc CFLAGS=-I/usr/local/include LDFLAGS=-static LDAPPEND=-lcfgmgr32 CP437_CONV=y DEST=pciregw64
make -f Makefile.gcc clean all CC=i686-linux-gnu-gcc CFLAGS=-I/usr/local/include LDFLAGS=-static
python3 pciids.py
- name: Build `usblgoff`

2
clib/clib_pci.c
View File

@@ -19,6 +19,8 @@
# include <uefi.h>
#else
# include <stdio.h>
# include <stdlib.h>
# include <string.h>
#endif
#include "clib_pci.h"
#ifdef PCI_LIB_VERSION

2
clib/clib_term.c
View File

@@ -222,7 +222,7 @@ void
term_unbuffer_stdout()
{
#ifdef _WIN32
SetConsoleOutputCP(65001);
SetConsoleOutputCP(437);
#endif
}

6
clib/gcc.mk
View File

@@ -21,7 +21,13 @@ CC ?= "gcc"
all: $(DEST)
%.o: %.c $(HEADERS)
ifeq "$(CP437_CONV)" "y"
../cp437/cp437 $<
$(CC) -I../clib $(CFLAGS) -x c -c $<_cp437 -o $@
-rm -f $<_cp437
else
$(CC) -I../clib $(CFLAGS) -c $< -o $@
endif
$(DEST): $(OBJS)
$(CC) $(OBJS) $(LDFLAGS) $(LDAPPEND) -o $@

4
pcireg/README.md
View File

@@ -53,7 +53,7 @@ Building
make CROSS_COMPILE=i686-w64-mingw32- HOST=i586-windows ZLIB=no DNS=no SHARED=no IDSDIR=""
sudo make install-lib PREFIX=/usr/i686-w64-mingw32
cd ..
make -f Makefile.gcc CC=i686-w64-mingw32-gcc CFLAGS=-I/usr/local/include LDFLAGS=-static LDAPPEND=-lcfgmgr32 DEST=pciregw
make -f Makefile.gcc CC=i686-w64-mingw32-gcc CFLAGS=-I/usr/local/include LDFLAGS=-static LDAPPEND=-lcfgmgr32 CP437_CONV=y DEST=pciregw
```
* 64-bit:
```
@@ -62,7 +62,7 @@ Building
make CROSS_COMPILE=x86_64-w64-mingw32- HOST=x86_64-windows ZLIB=no DNS=no SHARED=no IDSDIR=""
sudo make install-lib PREFIX=/usr/x86_64-w64-mingw32
cd ..
make -f Makefile.gcc CC=x86_64-w64-mingw32-gcc CFLAGS=-I/usr/local/include LDFLAGS=-static LDAPPEND=-lcfgmgr32 DEST=pciregw64
make -f Makefile.gcc CC=x86_64-w64-mingw32-gcc CFLAGS=-I/usr/local/include LDFLAGS=-static LDAPPEND=-lcfgmgr32 CP437_CONV=y DEST=pciregw64
```
### Linux target