From 58dee5546e38a17f597bbd2da76d527eaa729282 Mon Sep 17 00:00:00 2001 From: Robin Haberkorn Date: Mon, 7 Jun 2021 23:24:20 +0200 Subject: improved PDCurses detection * follow the current terminology: * PDCurses/Win32a is now called PDCursesMod and includes all other PDCurses ports as well. The Win32 GUI port is now called PDCurses/WinGUI. * PDCurses/Win32 is now called PDCurses/WinCon. * Since PDCursesMod supports WinCon as well, we use the PDCURSES_MOD macro only to detect PDCursesMod API extensions. GUIs (detached from system console) might be available both in classic PDCurses as well as in PDCursesMod. Only PDCursesMod allows detection of the port used *at runtime* using PDC_get_version(). We therefore introduced a --with-interface=pdcurses-gui that must be given whenever compiling for any kind of GUI port (including SDL on "classic" PDCurses). * The PDCURSES macro is used to detect all PDCurses (whether classic or PDCursesMod) API extensions. * __PDCURSES__ is used to detect PDCurses whenever API extensions are not required. * Assume that A_UNDERLINE now works even on WinCon. --- .github/workflows/ci.yml | 2 +- .github/workflows/nightly.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8e8c945..6b5f329 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -124,7 +124,7 @@ jobs: # PDCURSES_CFLAGS: -I/mingw32/include/pdcurses/ # run: | # autoreconf -i -# ./configure --with-interface=pdcurses --enable-html-manual +# ./configure --with-interface=pdcurses-gui --enable-html-manual # # - run: make # - run: make install diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index d17016a..bbbbda2 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -84,7 +84,7 @@ jobs: - name: Configure Build env: PDCURSES_CFLAGS: -I/mingw32/include/pdcurses/ - # The additional Windows libraries are for Win32a: + # The additional Windows libraries are for PDCursesMod/WinGUI: PDCURSES_LIBS: -lpdcurses -lgdi32 -lcomdlg32 LIBGLIB_LIBS: -lglib-2.0 -lintl -liconv -lpcre -lole32 -lws2_32 # FIXME: Once there is an --enable-lto, we should use that. @@ -93,7 +93,7 @@ jobs: LDFLAGS: -flto run: | autoreconf -i - ./configure --with-interface=pdcurses --enable-html-manual --enable-static-executables + ./configure --with-interface=pdcurses-gui --enable-html-manual --enable-static-executables - name: make run: make -j 2 -- cgit v1.2.3