.

Author: bugra9

cppjs-core/cpp.js/src/actions/createLib.js

@@ -45,7 +45,7 @@ export default function createLib(target, fileType, options = {}) {
         const ldFlags = Object.values(depPaths).filter(d => d.libPath).map((d) => `-L${d.libPath}`);
         let dependLibs = '';
         if (state.config.build?.buildType === 'configure') {
-            dependLibs = Object.keys(depPaths).filter(d => d).map((d) => `-l${d}`).join(' ');
+            dependLibs = Object.keys(depPaths).filter(d => d && d !== 'cmake').map((d) => `-l${d}`).join(' ');
         }
 
         const extraLibs = getExtraLibs ? getExtraLibs(target) : [];
@@ -69,7 +69,7 @@ export default function createLib(target, fileType, options = {}) {
         buildEnv.params.push('-e', `CFLAGS=${cFlags.join(' ')}`);
         buildEnv.params.push('-e', `CXXFLAGS=${cFlags.join(' ')}`);
         buildEnv.params.push('-e', `LDFLAGS=${ldFlags.join(' ')} ${extraLibs.join(' ')}`);
-        // buildEnv.params.push('-e', `LIBS=${dependLibs} ${extraLibs.join(' ')}`);
+        buildEnv.params.push('-e', `LIBS=${dependLibs} ${extraLibs.join(' ')}`);
 
         let configBuildEnv = state.config.build.env;
         if (configBuildEnv && typeof configBuildEnv === 'function') {

cppjs-core/cpp.js/src/bin.js

@@ -60,6 +60,9 @@ program.parse(process.argv);
 switch (program.args[0]) {
     case 'build': {
         const targetParams = commandBuild.opts();
+        if (targetParams.platform === 'wasm' && targetParams.arch === 'all') {
+            targetParams.arch = 'wasm32';
+        }
         if (state.config.build.withBuildConfig) {
             buildExternal(targetParams);
         } else {
@@ -253,7 +256,7 @@ async function buildExternal(targetParams) {
     buildLib(targetParams);
 
     if (copyToDist) {
-        const targetPath = `${state.config.paths.output}/prebuilt/${targetParams.platform}-${targetParams.arch}-${targetParams.runtime}-${targetParams.buildType}`;
+        const targets = getBuildTargets(targetParams);
         Object.entries(copyToDist).forEach(([key, value]) => {
             const values = [];
             if (Array.isArray(value)) {
@@ -262,10 +265,12 @@ async function buildExternal(targetParams) {
                 values.push(value);
             }
             values.forEach(v => {
-                const assetPath = `${targetPath}/${v}`;
-                if (!fs.existsSync(assetPath)) {
-                    fs.copyFileSync(`${state.config.paths.project}/${key}`, assetPath);
-                }
+                targets.forEach(target => {
+                    const assetPath = `${state.config.paths.output}/prebuilt/${target.path}/${v}`;
+                    if (!fs.existsSync(assetPath)) {
+                        fs.copyFileSync(`${state.config.paths.project}/${key}`, assetPath);
+                    }
+                });
             });
         });
     }

cppjs-packages/cppjs-package-gdal/cppjs-package-gdal-wasm/cppjs.build.js

@@ -31,6 +31,16 @@ export default {
             replacement: 'add_library(${GDAL_LIB_TARGET_NAME} gcore/gdal.h gcore/gdal_empty_file.cpp)',
             paths: ['gdal.cmake'],
         },
+        {
+            regex: 'CPL_CPUID\\(1, cpuinfo\\);',
+            replacement: '#ifdef __wasm__\n    cpuinfo[0]=0;cpuinfo[1]=0;cpuinfo[2]=0;cpuinfo[3]=0;\n#else\n    CPL_CPUID(1, cpuinfo);\n#endif',
+            paths: ['port/cpl_cpu_features.cpp'],
+        },
+        {
+            regex: '__asm__\\("xgetbv" : "=a"\\(nXCRLow\\), "=d"\\(nXCRHigh\\) : "c"\\(0\\)\\);',
+            replacement: '#ifdef __wasm__\n    nXCRLow = 0; nXCRHigh = 0;\n#else\n    $&\n#endif',
+            paths: ['port/cpl_cpu_features.cpp'],
+        },
     ],
     buildType: 'cmake',
     getBuildParams: (target, depPaths) => [

cppjs-packages/cppjs-package-geotiff/cppjs-package-geotiff-ios/cppjs.build.js

@@ -4,7 +4,7 @@ const platformBuild = {
 };
 
 const platformExtraLibs = {
-    'ios-iphonesimulator': ['-lstdc++'],
+    'ios': ['-lc++'],
 };
 
 export default {

cppjs-packages/cppjs-package-sqlite3/cppjs-package-sqlite3-android/cppjs.build.js

@@ -17,7 +17,10 @@ export default {
         },
     ],
     buildType: 'configure',
-    getBuildParams: (target) => platformBuild[`${target.platform}-${target.arch}`],
+    getBuildParams: (target) => [
+        ...platformBuild[`${target.platform}-${target.arch}`],
+        ...(target.runtime === 'mt' ? ['--enable-threadsafe'] : []),
+    ],
     env: [
         'CFLAGS="-fPIE -fPIC -DSQLITE_NOHAVE_SYSTEM -DSQLITE_DISABLE_LFS -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_NORMALIZE -DSQLITE_ENABLE_COLUMN_METADATA -DHAVE_GETHOSTUUID=0 -DSQLITE_ENABLE_RTREE=1"',
         'LDFLAGS="-pie -Wl,-soname,libsqlite3.so"',

cppjs-packages/cppjs-package-sqlite3/cppjs-package-sqlite3-ios/cppjs.build.js

@@ -12,6 +12,7 @@ export default {
     buildType: 'configure',
     getBuildParams: (target) => [
         ...(platformBuild[`${target.platform}-${target.arch}`] || []),
+        ...(target.runtime === 'mt' ? ['--enable-threadsafe'] : []),
     ],
     env: [
         'CFLAGS="-DSQLITE_NOHAVE_SYSTEM -DSQLITE_DISABLE_LFS -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_NORMALIZE -DSQLITE_ENABLE_COLUMN_METADATA -DHAVE_GETHOSTUUID=0 -DSQLITE_ENABLE_RTREE=1"',

cppjs-packages/cppjs-package-sqlite3/cppjs-package-sqlite3-wasm/cppjs.build.js

@@ -5,7 +5,7 @@ export default {
         return `https://www.sqlite.org/2025/sqlite-autoconf-${VERSION}.tar.gz`;
     },
     buildType: 'configure',
-    getBuildParams: () => ['--disable-shared', '--host=wasm32-unknown-emscripten'],
+    getBuildParams: (target) => ['--disable-shared', '--host=wasm32-unknown-emscripten', ...(target.runtime === 'mt' ? ['--enable-threadsafe'] : [])],
     env: [
         'CFLAGS="-DSQLITE_NOHAVE_SYSTEM -DSQLITE_DISABLE_LFS -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_NORMALIZE -DSQLITE_ENABLE_COLUMN_METADATA -DHAVE_GETHOSTUUID=0 -DSQLITE_ENABLE_RTREE=1"',
     ],

cppjs-packages/cppjs-package-zlib/cppjs-package-zlib-ios/cppjs-package-zlib.podspec

@@ -0,0 +1,13 @@
+require "json"
+package = JSON.parse(File.read(File.join(__dir__, "package.json")))
+
+Pod::Spec.new do |s|
+  s.module_name  = "z"
+  s.name         = "cppjs-package-zlib"
+  s.version      = package["nativeVersion"]
+  s.summary      = "A Massively Spiffy Yet Delicately Unobtrusive Compression Library"
+  s.homepage     = "https://www.zlib.net/"
+  s.author       = "ZLIB Authors"
+  s.source       = { :http => "https://cpp.js.org" }
+  s.vendored_frameworks = 'z.xcframework'
+end