custom interpretor set version with cmake

Denzy7 · May 13, 2022 · abcb0cf · abcb0cf
1 parent 9a91db5
commit abcb0cf
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 13 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -119,6 +119,7 @@ include(CheckIncludeFile)
 check_function_exists(clock_gettime DENGINE_HAS_CLOCK_GETTIME)
 check_include_file(pthread.h DENGINE_HAS_PTHREAD_H)
 
+set(DENGINE_PYTHON_DENGINE_SCRIPT_VER 1)
 configure_file(dengine_config.h.in dengine_config/dengine_config.h)
 
 add_subdirectory(lib/dengine-utils "dengine-utils-build")
@@ -140,7 +141,8 @@ if(DENGINE_BUILD_TESTS_PRIV)
 endif()
 
 add_subdirectory(main/dengitor)
-if(WIN32)
+if(MINGW)
+    # for mingw32 only
     add_subdirectory(main/python-dengine-script)
 endif()
 

diff --git a/dengine_config.h.in b/dengine_config.h.in
@@ -24,8 +24,7 @@
 #elif defined(__MINGW64__)
     #define DENGINE_MINGW_ARCH "x86_64"
 #endif
-    // for mingw32 only
-    #define DENGINE_PYTHON_DENGINE_SCRIPT_VER 1U
+    #cmakedefine DENGINE_PYTHON_DENGINE_SCRIPT_VER @DENGINE_PYTHON_DENGINE_SCRIPT_VER@
 #elif defined(__ANDROID__)
     #define DENGINE_ANDROID
     #define DENGINE_WIN_EGL

diff --git a/main/python-dengine-script/python-mingw32.c b/main/python-dengine-script/python-mingw32.c
@@ -2,11 +2,7 @@
 
 #define APPVER 1U
 
-#if defined(__MINGW32__)
-#define ARCH "i686"
-#elif defined(__MINGW64__)
-#define ARCH "x86_64"
-#else
+#ifndef DENGINE_MINGW_ARCH
 #error "This is only meant for mingw32!"
 #endif
 
@@ -19,7 +15,7 @@ int main(int argc, char* argv[])
 
     snprintf(stdlib, sizeof(stdlib),
              "%s/python-dengine-script-%u-%s-%s/python-stdlib",
-             denginescriptdir, APPVER, PY_VERSION, ARCH);
+             denginescriptdir, DENGINE_PYTHON_DENGINE_SCRIPT_VER, PY_VERSION, DENGINE_MINGW_ARCH);
     wchar_t* home = Py_DecodeLocale(stdlib, NULL);
     Py_SetPythonHome(home);
 
@@ -29,10 +25,10 @@ int main(int argc, char* argv[])
              "%s/python-dengine-script-%u-%s-%s/python-modules;"
              "%s/python-dengine-script-%u-%s-%s/python-stdlib/lib-dynload;"
              "%s/",
-             denginescriptdir, APPVER, PY_VERSION, ARCH,
-             denginescriptdir, APPVER, PY_VERSION, ARCH,
-             denginescriptdir, APPVER, PY_VERSION, ARCH,
-             denginescriptdir, APPVER, PY_VERSION, ARCH,
+             denginescriptdir, DENGINE_PYTHON_DENGINE_SCRIPT_VER, PY_VERSION, DENGINE_MINGW_ARCH,
+             denginescriptdir, DENGINE_PYTHON_DENGINE_SCRIPT_VER, PY_VERSION, DENGINE_MINGW_ARCH,
+             denginescriptdir, DENGINE_PYTHON_DENGINE_SCRIPT_VER, PY_VERSION, DENGINE_MINGW_ARCH,
+             denginescriptdir, DENGINE_PYTHON_DENGINE_SCRIPT_VER, PY_VERSION, DENGINE_MINGW_ARCH,
              denginescriptdir);
     wchar_t* path = Py_DecodeLocale(stdlib, NULL);
     Py_SetPath(path);