Fix assorted compilation errors, disable Unity builds for CI

Author: rdb

.github/workflows/ci.yml

@@ -41,6 +41,7 @@ jobs:
     - name: Configure CMake
       run: >
         cmake -B ${{ github.workspace }}/build
+        -DCMAKE_UNITY_BUILD=OFF
         -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }}
         -DCMAKE_C_COMPILER=${{ matrix.c_compiler }}
         -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}

CMakeLists.txt

@@ -70,6 +70,9 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/ma
 # intermediate configuration directory.
 set_property(GLOBAL PROPERTY XCODE_EMIT_EFFECTIVE_PLATFORM_NAME OFF)
 
+# Build all static libraries with -fPIC.
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+
 # Include modules builtin to CMake
 include(GNUInstallDirs)     # Defines CMAKE_INSTALL_<dir> variables
 

src/Config.cmake

@@ -26,26 +26,6 @@ option(BUILD_SHARED_LIBS
 Utilities/tools/binaries/etc are then dynamically linked to the
 libraries instead of being statically linked." ${_default_shared})
 
-# The character used to separate components of an OS-specific
-# directory name depends on the platform (it is '/' on Unix, '\' on
-# Windows).  That character selection is hardcoded into Panda and
-# cannot be changed here.  (Note that an internal Panda filename
-# always uses the forward slash, '/', to separate the components of a
-# directory name.)
-
-# There's a different character used to separate the complete
-# directory names in a search path specification.  On Unix, the
-# normal convention is ':', on Windows, it has to be ';', because the
-# colon is already used to mark the drive letter.  This character is
-# selectable here.  Most users won't want to change this.  If
-# multiple characters are placed in this string, any one of them may
-# be used as a separator character.
-if(WIN32)
-  set(DEFAULT_PATHSEP ";")
-else()
-  set(DEFAULT_PATHSEP ":")
-endif()
-
 
 # The following options relate to interrogate, the tool that is
 # used to generate bindings for non-C++ languages.

src/cppparser/cppAttributeList.h

@@ -17,6 +17,7 @@
 //#include "dtoolbase.h"
 
 #include <vector>
+#include <string>
 
 class CPPExpression;
 class CPPIdentifier;

src/cppparser/cppBison.cxx.prebuilt

@@ -294,7 +294,7 @@ pop_struct() {
 #  endif
 # endif
 
-#include "cppBison.yxx.h"
+#include "cppBison.h"
 /* Symbol kind.  */
 enum yysymbol_kind_t
 {

src/cppparser/cppDeclaration.h

@@ -25,6 +25,7 @@
 #include <vector>
 #include <map>
 #include <set>
+#include <ostream>
 
 class CPPInstance;
 class CPPTemplateParameterList;

src/cppparser/cppManifest.cxx

@@ -313,10 +313,10 @@ extract_args(vector_string &args, const string &expr, size_t &p) const {
     }
   }
 
-  if ((int)args.size() < _num_parameters) {
+  if (args.size() < _num_parameters) {
     _parser.warning("Not enough arguments for manifest " + _name);
   }
-  else if (_variadic_param < 0 && (int)args.size() > _num_parameters) {
+  else if (_variadic_param < 0 && args.size() > _num_parameters) {
     _parser.warning("Too many arguments for manifest " + _name);
   }
 }

src/dtoolbase/dtoolsymbols.h

@@ -72,21 +72,12 @@
   #define BUILDING_DTOOL_DTOOLUTIL
 #endif
 
-#ifdef BUILDING_DTOOL_DTOOLBASE
-  #define EXPCL_DTOOL_DTOOLBASE EXPORT_CLASS
-  #define EXPTP_DTOOL_DTOOLBASE EXPORT_TEMPL
-#else
-  #define EXPCL_DTOOL_DTOOLBASE IMPORT_CLASS
-  #define EXPTP_DTOOL_DTOOLBASE IMPORT_TEMPL
-#endif
+// These are always built statically at the moment.
+#define EXPCL_DTOOL_DTOOLBASE
+#define EXPTP_DTOOL_DTOOLBASE
 
-#ifdef BUILDING_DTOOL_DTOOLUTIL
-  #define EXPCL_DTOOL_DTOOLUTIL EXPORT_CLASS
-  #define EXPTP_DTOOL_DTOOLUTIL EXPORT_TEMPL
-#else
-  #define EXPCL_DTOOL_DTOOLUTIL IMPORT_CLASS
-  #define EXPTP_DTOOL_DTOOLUTIL IMPORT_TEMPL
-#endif
+#define EXPCL_DTOOL_DTOOLUTIL
+#define EXPTP_DTOOL_DTOOLUTIL
 
 #ifdef BUILDING_INTERROGATEDB
   #define EXPCL_INTERROGATEDB EXPORT_CLASS

src/dtoolbase/pstrtod.cxx

@@ -16,9 +16,12 @@
 #include <ctype.h>
 #include <math.h>
 #include <limits>
+#include <string.h>
 
 #ifdef _WIN32
 #define strncasecmp _strnicmp
+#else
+#include <strings.h>
 #endif
 
 /**

src/dtoolutil/CMakeLists.txt

@@ -73,9 +73,6 @@ foreach(var
 
 endforeach(var)
 
-# dSearchPath.cxx:
-target_compile_definitions(dtoolutil PRIVATE "DEFAULT_PATHSEP=\"${DEFAULT_PATHSEP}\"")
-
 # Public definitions for getopt.
 foreach(var
     HAVE_GETOPT

src/dtoolutil/dSearchPath.cxx

@@ -17,6 +17,12 @@
 #include <algorithm>
 #include <iterator>
 
+#ifdef _WIN32
+#define DEFAULT_PATHSEP ";"
+#else
+#define DEFAULT_PATHSEP ":"
+#endif
+
 using std::ostream;
 using std::string;
 

src/dtoolutil/filename.I

@@ -594,10 +594,9 @@ operator < (const std::string &other) const {
  */
 INLINE int Filename::
 compare_to(const Filename &other) const {
-  return strcmp(_filename.c_str(), other._filename.c_str());
+  return _filename.compare(other._filename);
 }
 
-
 /**
  * Returns true if the Filename is valid (not empty), or false if it is an
  * empty string.

src/dtoolutil/filename.cxx

@@ -30,6 +30,10 @@
 #include <unistd.h>
 #endif
 
+#ifdef _MSC_VER
+#include <malloc.h>
+#endif
+
 #ifdef PHAVE_GLOB_H
   #include <glob.h>
   #ifndef GLOB_NOMATCH
@@ -144,7 +148,7 @@ get_panda_root() {
     char *envvar = nullptr;
     size_t size = 0;
     while (getenv_s(&size, envvar, size, "PANDA_ROOT") == ERANGE) {
-      envvar = (char *)alloca(size);
+      envvar = (char *)_alloca(size);
     }
     if (size != 0) {
       (*panda_root) = front_to_back_slash(envvar);

src/dtoolutil/textEncoder.h

@@ -18,6 +18,9 @@
 #include "unicodeLatinMap.h"
 
 #include <ctype.h>
+#include <istream>
+#include <ostream>
+#include <string>
 
 class StringDecoder;
 

src/dtoolutil/win32ArgParser.cxx

@@ -147,7 +147,7 @@ do_glob() {
   // means to do it.
   std::string envvar(128, '\0');
   size_t size = envvar.size();
-  while (getenv_s(&size, &envvar[0], size, var.c_str()) == ERANGE) {
+  while (getenv_s(&size, &envvar[0], size, "PANDA_GLOB") == ERANGE) {
     envvar.resize(size);
   }
   if (size > 1) {

src/interrogate/interrogateBuilder.cxx

@@ -49,6 +49,7 @@
 
 #include <ctype.h>
 #include <algorithm>
+#include <cstring>
 
 using std::cerr;
 using std::istream;
@@ -564,7 +565,7 @@ write_code(ostream &out_code,ostream * out_include, InterrogateModuleDef *def) {
 InterrogateModuleDef *InterrogateBuilder::
 make_module_def(int file_identifier) {
   InterrogateModuleDef *def = new InterrogateModuleDef;
-  memset(def, 0, sizeof(InterrogateModuleDef));
+  std::memset(def, 0, sizeof(InterrogateModuleDef));
 
   def->file_identifier = file_identifier;
   def->library_name = library_name.c_str();

src/interrogatedb/interrogate_datafile.cxx

@@ -13,6 +13,8 @@
 
 #include "interrogate_datafile.h"
 
+#include <cstring>
+
 using std::istream;
 using std::ostream;
 using std::string;
@@ -60,7 +62,7 @@ idf_output_string(ostream &out, const char *str, char whitespace) {
   if (str == nullptr) {
     out << "0 ";
   } else {
-    out << strlen(str) << whitespace;
+    out << std::strlen(str) << whitespace;
     if (str[0] != '\0') {
       out << str << whitespace;
     }

src/interrogatedb/interrogate_datafile.h

@@ -17,8 +17,9 @@
 // This file defines some convenience functions for reading and writing the
 // interrogate database files.
 
-#include "dtoolbase.h"
 #include <vector>
+#include <istream>
+#include <ostream>
 
 void idf_output_string(std::ostream &out, const std::string &str, char whitespace = ' ');
 void idf_input_string(std::istream &in, std::string &str);