Drop support for 32bit executables in C++ code

Author: overfl0

CMakeLists.txt

@@ -15,8 +15,6 @@ list(GET PYTHON_VERSION_LIST 1 PYTHON_VERSION_MINOR)
 list(GET PYTHON_VERSION_LIST 2 PYTHON_VERSION_PATCH)
 #####################################################################################
 
-option(USE_64BIT_BUILD "USE_64BIT_BUILD" ON)
-
 project(PythiaProject)
 
 message(STATUS "Cmake version: ${CMAKE_VERSION}")
@@ -34,14 +32,8 @@ if(CMAKE_COMPILER_IS_GNUCXX)
     set(CMAKE_PREFIX_PATH "@Pythia/python-${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}-embed-linux64")
 
 else() # MSVC
-    if(CMAKE_SIZEOF_VOID_P LESS 8)
-        set(USE_64BIT_BUILD OFF)
-        message(STATUS "Setting MSVC flags (32bit)")
-        set(CMAKE_PREFIX_PATH "@Pythia/python-${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}-embed-win32")
-    else()
-        message(STATUS "Setting MSVC flags (64bit)")
-        set(CMAKE_PREFIX_PATH "@Pythia/python-${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}-embed-amd64")
-    endif()
+    message(STATUS "Setting MSVC flags (64bit)")
+    set(CMAKE_PREFIX_PATH "@Pythia/python-${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}-embed-amd64")
 
     message(STATUS "Setting MSVC flags")
 

CMakeSettings.json

@@ -13,19 +13,6 @@
             "variables": [
             ]
         },
-        {
-            "name": "x86-Release",
-            "generator": "Ninja",
-            "configurationType": "RelWithDebInfo",
-            "buildRoot": "${projectDir}\\out\\build\\${name}",
-            "installRoot": "${projectDir}\\out\\install\\${name}",
-            "cmakeCommandArgs": "",
-            "buildCommandArgs": "",
-            "ctestCommandArgs": "",
-            "inheritEnvironments": [ "msvc_x86_x64" ],
-            "variables": [
-            ]
-        },
         {
             "name": "x64-WSL-GCC-Release",
             "generator": "Ninja",

src/Pythia/CMakeLists.txt

@@ -36,18 +36,9 @@ add_custom_command(
         "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/../@Pythia/"
 )
 
-if(USE_64BIT_BUILD)
-    set_target_properties(Pythia PROPERTIES
-        OUTPUT_NAME "Pythia_x64"
-        PREFIX ""
-        BUILD_WITH_INSTALL_RPATH TRUE
-        INSTALL_RPATH "\$ORIGIN/python-${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}-embed-linux64/lib"
-    )
-else()
-    set_target_properties(Pythia PROPERTIES
-        OUTPUT_NAME "Pythia"
-        PREFIX ""
-        BUILD_WITH_INSTALL_RPATH TRUE
-        INSTALL_RPATH "\$ORIGIN/python-${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}-embed-linux32/lib"
-    )
-endif()
+set_target_properties(Pythia PROPERTIES
+    OUTPUT_NAME "Pythia_x64"
+    PREFIX ""
+    BUILD_WITH_INSTALL_RPATH TRUE
+    INSTALL_RPATH "\$ORIGIN/python-${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}-embed-linux64/lib"
+)

src/Pythia/Paths.cpp

@@ -4,11 +4,7 @@
 #include "Logger.h"
 
 #ifdef _WIN32
-    #ifdef _WIN64
     #define EMBEDDEDPYTHONPATH L"python-" PYTHON_VERSION "-embed-amd64"
-    #else
-    #define EMBEDDEDPYTHONPATH L"python-" PYTHON_VERSION "-embed-win32"
-    #endif
 #else // ifdef _WIN32
     #define EMBEDDEDPYTHONPATH "python-" PYTHON_VERSION "-embed-linux64"
 #endif

src/PythiaSetPythonPath/CMakeLists.txt

@@ -20,14 +20,7 @@ add_custom_command(
         "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/../@Pythia/"
 )
 
-if(USE_64BIT_BUILD)
-    set_target_properties(PythiaSetPythonPath PROPERTIES
-        OUTPUT_NAME "PythiaSetPythonPath_x64"
-        PREFIX ""
-    )
-else()
-    set_target_properties(PythiaSetPythonPath PROPERTIES
-        OUTPUT_NAME "PythiaSetPythonPath"
-        PREFIX ""
-    )
-endif()
+set_target_properties(PythiaSetPythonPath PROPERTIES
+    OUTPUT_NAME "PythiaSetPythonPath_x64"
+    PREFIX ""
+)

src/PythiaTester/ArmaExtension.h

@@ -80,13 +80,8 @@ class ArmaExtension
             return;
         }
 
-        #if defined _WIN32 && !defined _WIN64
-            rvextensionPtr = (RVExtension_t)getFunction("_RVExtension@12");
-            rvextensionVersionPtr = (RVExtensionVersion_t)getFunction("_RVExtensionVersion@8");
-        #else
-            rvextensionPtr = (RVExtension_t)getFunction("RVExtension");
-            rvextensionVersionPtr = (RVExtensionVersion_t)getFunction("RVExtensionVersion");
-        #endif
+        rvextensionPtr = (RVExtension_t)getFunction("RVExtension");
+        rvextensionVersionPtr = (RVExtensionVersion_t)getFunction("RVExtensionVersion");
     }
 
     void unload()
@@ -104,9 +99,7 @@ class ArmaExtension
     private:
     static std::string fixName(std::string name)
     {
-        #if defined(_WIN64) || defined(__amd64__) || defined(_M_X64)
-            name += "_x64";
-        #endif
+        name += "_x64";
 
         #ifdef _WIN32
             name += ".dll";

src/PythiaTester/CMakeLists.txt

@@ -16,20 +16,11 @@ add_custom_command(
         "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/../@Pythia/"
 )
 
-if(USE_64BIT_BUILD)
-    set_target_properties(PythiaTester PROPERTIES
-        OUTPUT_NAME "PythiaTester_x64"
-        BUILD_WITH_INSTALL_RPATH TRUE
-        INSTALL_RPATH "\$ORIGIN"
-    )
-else()
-    set_target_properties(PythiaTester PROPERTIES
-        OUTPUT_NAME "PythiaTester"
-        BUILD_WITH_INSTALL_RPATH TRUE
-        INSTALL_RPATH "\$ORIGIN"
-    )
-endif()
-
+set_target_properties(PythiaTester PROPERTIES
+    OUTPUT_NAME "PythiaTester_x64"
+    BUILD_WITH_INSTALL_RPATH TRUE
+    INSTALL_RPATH "\$ORIGIN"
+)
 
 if(CMAKE_COMPILER_IS_GNUCXX)
     target_link_libraries(PythiaTester dl)

tests/tests.py

@@ -24,10 +24,7 @@ class Base(unittest.TestCase):
 
     @staticmethod
     def pythia_tester():
-        name = 'PythiaTester'
-
-        if platform.architecture()[0] == '64bit':
-            name += '_x64'
+        name = 'PythiaTester_x64'
 
         if platform.system() == 'Windows':
             name += '.exe'

tools/build.py

@@ -105,7 +105,7 @@ def build_binaries(version, system, run_tests=True):
         docker_prefix = []
         shell = True
 
-    _verbose_run(docker_prefix + ['cmake', '-G', 'Ninja', '-DUSE_64BIT_BUILD="ON"', '-DCMAKE_BUILD_TYPE=RelWithDebInfo', '..'], check=True, cwd='ninja', env=env, shell=shell)
+    _verbose_run(docker_prefix + ['cmake', '-G', 'Ninja', '-DCMAKE_BUILD_TYPE=RelWithDebInfo', '..'], check=True, cwd='ninja', env=env, shell=shell)
     _verbose_run(docker_prefix + ['ninja'], check=True, cwd='ninja', env=env, shell=shell)
 
 

tools/rebuild64.sh

@@ -2,5 +2,5 @@ set -e
 
 docker build -f Dockerfile.x64 -t pythia:latest .
 rm -rf ninja/*
-docker run --rm -v "$(pwd)"/:/data -w /data/ninja pythia:latest cmake -G Ninja -DCMAKE_PREFIX_PATH=@Pythia/python-310-embed-linux64 -DUSE_64BIT_BUILD=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo ..
+docker run --rm -v "$(pwd)"/:/data -w /data/ninja pythia:latest cmake -G Ninja -DCMAKE_PREFIX_PATH=@Pythia/python-310-embed-linux64 -DCMAKE_BUILD_TYPE=RelWithDebInfo ..
 docker run --rm -v "$(pwd)"/:/data -w /data/ninja pythia:latest ninja