Use argtable2 if found, but fall back to argtable3 if needed.

omf2097 · Jul 13, 2024 · 2ce75f7 · 2ce75f7
1 parent 45cad2c
commit 2ce75f7
Show file tree

Hide file tree

Showing 19 changed files with 106 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -47,6 +47,7 @@ find_package(xmp)
 find_package(enet)
 find_package(confuse)
 find_package(argtable2)
+find_package(argtable3)
 find_package(PNG)
 find_package(ZLIB)
 
@@ -76,7 +77,6 @@ set(COREINCS
     ${CONFUSE_INCLUDE_DIR}
     ${XMP_INCLUDE_DIR}
     ${ENET_INCLUDE_DIR}
-    ${ARGTABLE2_INCLUDE_DIR}
     ${PNG_INCLUDE_DIR}
     ${ZLIB_INCLUDE_DIR}
 )
@@ -85,11 +85,24 @@ set(CORELIBS
     ${CONFUSE_LIBRARY}
     ${XMP_LIBRARY}
     ${ENET_LIBRARY}
-    ${ARGTABLE2_LIBRARY}
     ${PNG_LIBRARY}
     ${ZLIB_LIBRARY}
 )
 
+if(ARGTABLE2_FOUND)
+  set(COREINCS ${COREINCS} ${ARGTABLE2_INCLUDE_DIR})
+  add_compile_definitions(ARGTABLE2_FOUND)
+elseif(ARGTABLE3_FOUND)
+  set(COREINCS ${COREINCS} ${ARGTABLE3_INCLUDE_DIR})
+  add_compile_definitions(ARGTABLE3_FOUND)
+endif()
+
+if(ARGTABLE2_FOUND)
+  set(CORELIBS ${CORELIBS} ${ARGTABLE2_LIBRARY})
+elseif(ARGTABLE3_FOUND)
+  set(CORELIBS ${CORELIBS} ${ARGTABLE3_LIBRARY})
+endif()
+
 # MingW build should add mingw32 lib
 if(MINGW)
     set(CORELIBS mingw32 ${CORELIBS})

diff --git a/INSTALL.md b/INSTALL.md
@@ -45,7 +45,7 @@ Required:
 * SDL2 (>=2.0.16): http://www.libsdl.org/download-2.0.php
 * confuse: http://www.nongnu.org/confuse/
 * Enet: http://enet.bespin.org/
-* libargtable2: http://argtable.sourceforge.net/
+* libargtable2 or libargtable3: http://argtable.sourceforge.net/ or http://www.argtable.org/
 * libpng: http://www.libpng.org/pub/png/libpng.html
 * zlib: http://www.zlib.net/ (for libpng)
 * SDL2_Mixer (>=2.0.4): https://github.com/libsdl-org/SDL_mixer

diff --git a/cmake-scripts/Findargtable2.cmake b/cmake-scripts/Findargtable2.cmake
@@ -23,8 +23,6 @@ if(ARGTABLE2_FOUND)
     set(ARGTABLE2_LIBRARIES ${ARGTABLE2_LIBRARY})
     set(ARGTABLE2_INCLUDE_DIRS ${ARGTABLE2_INCLUDE_DIR})
     message(STATUS "Found Argtable2: ${ARGTABLE2_LIBRARIES}")
-else()
-    message(WARNING "Could not find Argtable2")
 endif()
 
 mark_as_advanced(ARGTABLE2_INCLUDE_DIR ARGTABLE2_LIBRARY ARGTABLE2_SEARCH_PATHS)
diff --git a/cmake-scripts/Findargtable3.cmake b/cmake-scripts/Findargtable3.cmake
@@ -0,0 +1,30 @@
+set(ARGTABLE3_SEARCH_PATHS
+    /usr/local
+    /usr
+    /opt
+)
+
+find_path(ARGTABLE3_INCLUDE_DIR argtable3.h 
+    HINTS
+    PATH_SUFFIXES include
+    PATHS ${ARGTABLE3_SEARCH_PATHS}
+)
+find_library(ARGTABLE3_LIBRARY argtable3 
+    HINTS
+    PATH_SUFFIXES lib64 lib
+    PATHS ${ARGTABLE3_SEARCH_PATHS}
+)
+
+if(ARGTABLE3_INCLUDE_DIR AND ARGTABLE3_LIBRARY)
+   set(ARGTABLE3_FOUND TRUE)
+endif()
+
+if(ARGTABLE3_FOUND)
+    set(ARGTABLE3_LIBRARIES ${ARGTABLE3_LIBRARY})
+    set(ARGTABLE3_INCLUDE_DIRS ${ARGTABLE3_INCLUDE_DIR})
+    message(STATUS "Found Argtable3: ${ARGTABLE3_LIBRARIES}")
+else()
+    message(WARNING "Could not find Argtable3")
+endif()
+
+mark_as_advanced(ARGTABLE3_INCLUDE_DIR ARGTABLE3_LIBRARY ARGTABLE3_SEARCH_PATHS)
diff --git a/src/main.c b/src/main.c
@@ -12,7 +12,11 @@
 #include "utils/msgbox.h"
 #include "utils/random.h"
 #include <SDL.h>
+#if ARGTABLE2_FOUND
 #include <argtable2.h>
+#elif ARGTABLE3_FOUND
+#include <argtable3.h>
+#endif
 #include <enet/enet.h>
 #include <stdio.h>
 #include <string.h>

diff --git a/tools/afdiff/main.c b/tools/afdiff/main.c
@@ -4,7 +4,11 @@
  * @license MIT
  */
 
+#if ARGTABLE2_FOUND
 #include <argtable2.h>
+#elif ARGTABLE3_FOUND
+#include <argtable3.h>
+#endif
 #include <stdint.h>
 #include <string.h>
 

diff --git a/tools/aftool/main.c b/tools/aftool/main.c
@@ -9,7 +9,11 @@
 #include "formats/af.h"
 #include "formats/error.h"
 #include <SDL.h>
+#if ARGTABLE2_FOUND
 #include <argtable2.h>
+#elif ARGTABLE3_FOUND
+#include <argtable3.h>
+#endif
 #include <stdint.h>
 #include <string.h>
 

diff --git a/tools/altpaltool/main.c b/tools/altpaltool/main.c
@@ -5,7 +5,11 @@
 
 #include "formats/altpal.h"
 #include "formats/error.h"
+#if ARGTABLE2_FOUND
 #include <argtable2.h>
+#elif ARGTABLE3_FOUND
+#include <argtable3.h>
+#endif
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/tools/bktool/main.c b/tools/bktool/main.c
@@ -9,7 +9,11 @@
 #include "formats/bk.h"
 #include "formats/error.h"
 #include <SDL.h>
+#if ARGTABLE2_FOUND
 #include <argtable2.h>
+#elif ARGTABLE3_FOUND
+#include <argtable3.h>
+#endif
 #include <stdint.h>
 #include <string.h>
 

diff --git a/tools/chrtool/main.c b/tools/chrtool/main.c
@@ -7,7 +7,11 @@
 #include "formats/bk.h"
 #include "formats/chr.h"
 #include "formats/error.h"
+#if ARGTABLE2_FOUND
 #include <argtable2.h>
+#elif ARGTABLE3_FOUND
+#include <argtable3.h>
+#endif
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/tools/fonttool/main.c b/tools/fonttool/main.c
@@ -7,7 +7,11 @@
 #include "formats/error.h"
 #include "formats/fonts.h"
 #include <SDL2/SDL.h>
+#if ARGTABLE2_FOUND
 #include <argtable2.h>
+#elif ARGTABLE3_FOUND
+#include <argtable3.h>
+#endif
 #include <stdint.h>
 #include <string.h>
 

diff --git a/tools/languagetool/main.c b/tools/languagetool/main.c
@@ -6,7 +6,11 @@
 
 #include "formats/error.h"
 #include "formats/language.h"
+#if ARGTABLE2_FOUND
 #include <argtable2.h>
+#elif ARGTABLE3_FOUND
+#include <argtable3.h>
+#endif
 
 int main(int argc, char *argv[]) {
     // commandline argument parser options

diff --git a/tools/pictool/main.c b/tools/pictool/main.c
@@ -7,7 +7,11 @@
 #include "formats/bk.h"
 #include "formats/error.h"
 #include "formats/pic.h"
+#if ARGTABLE2_FOUND
 #include <argtable2.h>
+#elif ARGTABLE3_FOUND
+#include <argtable3.h>
+#endif
 
 int main(int argc, char *argv[]) {
     // commandline argument parser options

diff --git a/tools/rectool/main.c b/tools/rectool/main.c
@@ -6,7 +6,11 @@
 #include "../shared/pilot.h"
 #include "formats/error.h"
 #include "formats/rec.h"
+#if ARGTABLE2_FOUND
 #include <argtable2.h>
+#elif ARGTABLE3_FOUND
+#include <argtable3.h>
+#endif
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/tools/scoretool/main.c b/tools/scoretool/main.c
@@ -6,7 +6,11 @@
 
 #include "formats/error.h"
 #include "formats/score.h"
+#if ARGTABLE2_FOUND
 #include <argtable2.h>
+#elif ARGTABLE3_FOUND
+#include <argtable3.h>
+#endif
 
 const char *page_name[] = {"ONE ROUND", "BEST 2 OF 3", "BEST 3 OF 5", "BEST 4 OF 7"};
 

diff --git a/tools/setuptool/main.c b/tools/setuptool/main.c
@@ -6,7 +6,11 @@
 #include "../shared/pilot.h"
 #include "formats/error.h"
 #include "formats/setup.h"
+#if ARGTABLE2_FOUND
 #include <argtable2.h>
+#elif ARGTABLE3_FOUND
+#include <argtable3.h>
+#endif
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/tools/soundtool/main.c b/tools/soundtool/main.c
@@ -7,7 +7,11 @@
 #include "formats/error.h"
 #include "formats/sounds.h"
 #include <SDL.h>
+#if ARGTABLE2_FOUND
 #include <argtable2.h>
+#elif ARGTABLE3_FOUND
+#include <argtable3.h>
+#endif
 
 typedef struct _streamer {
     char *data;

diff --git a/tools/stringparser/main.c b/tools/stringparser/main.c
@@ -6,7 +6,11 @@
 
 #include "formats/error.h"
 #include "formats/script.h"
+#if ARGTABLE2_FOUND
 #include <argtable2.h>
+#elif ARGTABLE3_FOUND
+#include <argtable3.h>
+#endif
 #include <stdint.h>
 #include <string.h>
 

diff --git a/tools/trntool/main.c b/tools/trntool/main.c
@@ -7,7 +7,11 @@
 #include "../shared/pilot.h"
 #include "formats/error.h"
 #include "formats/tournament.h"
+#if ARGTABLE2_FOUND
 #include <argtable2.h>
+#elif ARGTABLE3_FOUND
+#include <argtable3.h>
+#endif
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>