Mac c4dpy compatibility

daz3d · Nov 25, 2024 · ba11ada · ba11ada
1 parent b8d45a4
commit ba11ada
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 10 deletions.
diff --git a/Cinema 4D/appdir_common/plugins/DazToC4D/DazToC4D.pyp b/Cinema 4D/appdir_common/plugins/DazToC4D/DazToC4D.pyp
@@ -1,7 +1,7 @@
 DZBRIDGE_VERSION_MAJOR = 2024
 DZBRIDGE_VERSION_MINOR = 2
-DZBRIDGE_VERSION_REVISION = 30
-DZBRIDGE_VERSION_BUILD = 65
+DZBRIDGE_VERSION_REVISION = 31
+DZBRIDGE_VERSION_BUILD = 67
 DZBRIDGE_VERSION_STRING = "v%s.%s.%s.%s" % (DZBRIDGE_VERSION_MAJOR, DZBRIDGE_VERSION_MINOR, DZBRIDGE_VERSION_REVISION, DZBRIDGE_VERSION_BUILD)
 ##
 ## DazToC4D

diff --git a/DazStudioPlugin/DzC4DAction.cpp b/DazStudioPlugin/DzC4DAction.cpp
@@ -64,12 +64,19 @@ bool GenerateExporterBatchFile(QString batchFilePath, QString sExecutablePath, Q
 	QDir().mkdir(sBatchFileFolder);
 
 	// 4. Generate manual batch file to launch exporter scripts
-
+
+#ifdef WIN32
 	QString sBatchString = QString("\
 chcp 65001\n\n\
 cd /d \"%1\"\n\n\
 \"%2\"\
 ").arg(sCWD).arg(sExecutablePath);
+#else defined(__APPLE__)
+    QString sBatchString = QString("\
+cd \"%1\"\n\n\
+\"%2\"\
+").arg(sCWD).arg(sExecutablePath);
+#endif
 	foreach(QString arg, sCommandArgs.split(";"))
 	{
 		if (arg.contains(" "))
@@ -161,15 +168,18 @@ DzError	DzC4DExporter::write(const QString& filename, const DzFileIOSettings* op
 
 	//////////////////////////////////////////////////////////////////////////////////////////
 
-	//QString sC4DLogPath = sIntermediatePath + "/" + "create_c4d_file.log";
-	//QString sScriptPath = sIntermediateScriptsPath + "/" + "create_c4d_file.py";
 	//QString sCommandArgs = QString("%1;%2").arg(sScriptPath).arg(pC4DAction->m_sDestinationFBX);
+#ifdef WIN32
 	QString sC4DLogPath = QString(".") + "/" + "create_c4d_file.log";
 	QString sScriptPath = QString("./Scripts") + "/" + "create_c4d_file.py";
+#else defined(__APPLE__)
+    QString sC4DLogPath = sIntermediatePath + "/" + "create_c4d_file.log";
+    QString sScriptPath = sIntermediateScriptsPath + "/" + "create_c4d_file.py";
+#endif
 	QString sCommandArgs = QString("%1;%2").arg(sScriptPath).arg(pC4DAction->m_sDestinationFBX);
-#if WIN32
+#ifdef WIN32
 	QString batchFilePath = sIntermediatePath + "/" + "create_c4d_file.bat";
-#else
+#else defined(__APPLE__)
 	QString batchFilePath = sIntermediatePath + "/" + "create_c4d_file.sh";
 #endif
 	QString sC4DPyExecutable = FindC4DPyExe(pC4DAction->m_sC4DExecutablePath);

diff --git a/DazStudioPlugin/Resources/c4dplugin.zip b/DazStudioPlugin/Resources/c4dplugin.zip
diff --git a/DazStudioPlugin/real_version.h b/DazStudioPlugin/real_version.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#define PRODUCT_VERSION_STRING "2024 version 2.30"
+#define PRODUCT_VERSION_STRING "2024 version 2.31"
 #define VER_MAJOR	2024
 #define VER_MINOR	2
-#define VER_REV		30
-#define VER_BUILD	65
+#define VER_REV		31
+#define VER_BUILD	67
 
 #define TOSTRING(x) #x
 #define VERSION_STRING	TOSTRING(VER_MAJOR) "." TOSTRING(VER_MINOR) "." TOSTRING(VER_REV) "." TOSTRING(VER_BUILD)