Skip to content

Commit 75d5e89

Browse files
committed
don't package turntable code
Don't package or compile turntable code, i.e. ReviewLastSavedModel or FbxTurnTableBase. Modify InstallIIntegration so it doesnt depend on ReviewLastSavedModel
1 parent 39c292a commit 75d5e89

File tree

2 files changed

+5
-24
lines changed

2 files changed

+5
-24
lines changed

Assets/FbxExporters/Editor/InstallIntegration.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ public class Integrations
2020

2121
private const string MODULE_TEMPLATE_PATH = "FbxExporters/Integrations/Autodesk/maya/" + MODULE_FILENAME + ".txt";
2222

23+
public const string TEMP_SAVE_PATH = "_safe_to_delete";
24+
2325
#if UNITY_EDITOR_OSX
2426
private const string MAYA_MODULES_PATH = "Library/Preferences/Autodesk/Maya/modules";
2527
#elif UNITY_EDITOR_LINUX
@@ -90,7 +92,7 @@ public static string GetPackagePath()
9092

9193
public static string GetTempSavePath()
9294
{
93-
return FbxExporters.Review.TurnTable.TempSavePath.Replace("\\", "/");
95+
return TEMP_SAVE_PATH.Replace("\\", "/");
9496
}
9597

9698
/// <summary>

CMakeLists.txt

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -114,29 +114,11 @@ add_custom_target(
114114
# Compile editor scripts into a multi-platform DLL
115115
if("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
116116
set(CLASS_LIBRARY_DEST "${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE}")
117-
set(RUNTIME_CLASS_LIBRARY_NAME "UnityFbxExporter.dll")
118117

119118
add_custom_command(OUTPUT ${CLASS_LIBRARY_DEST}
120119
COMMAND ${CMAKE_COMMAND} -E make_directory ${CLASS_LIBRARY_DEST}
121120
)
122121

123-
fbxexporters_compile_csharp(OUTPUT ${CLASS_LIBRARY_DEST}/${RUNTIME_CLASS_LIBRARY_NAME}
124-
EXTRA_ARGS
125-
"/target:library"
126-
SOURCES
127-
"${CMAKE_SOURCE_DIR}/Assets/FbxExporters/FbxTurnTableBase.cs"
128-
REFERENCES
129-
"${CSHARP_MSCORLIB_LIBRARY}"
130-
"${CSHARP_SYSTEM_CORE_LIBRARY}"
131-
"${CSHARP_SYSTEM_LIBRARY}"
132-
"${CSHARP_UNITYEDITOR_LIBRARY}"
133-
"${CSHARP_UNITYENGINE_LIBRARY}"
134-
"${CMAKE_SOURCE_DIR}/Assets/FbxExporters/FbxSdk/Plugins/UnityFbxSdk.dll"
135-
DEPENDS
136-
"${CLASS_LIBRARY_DEST}"
137-
)
138-
add_custom_target(UnityFbxExporterRuntimeDLL ALL DEPENDS ${CLASS_LIBRARY_DEST}/${RUNTIME_CLASS_LIBRARY_NAME})
139-
140122
set(EDITOR_CLASS_LIBRARY_NAME "UnityFbxExporterEditor.dll")
141123
fbxexporters_compile_csharp(OUTPUT ${CLASS_LIBRARY_DEST}/${EDITOR_CLASS_LIBRARY_NAME}
142124
EXTRA_ARGS
@@ -145,18 +127,15 @@ if("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
145127
"${CMAKE_SOURCE_DIR}/Assets/FbxExporters/Editor/FbxExporter.cs"
146128
"${CMAKE_SOURCE_DIR}/Assets/FbxExporters/Editor/FbxExportSettings.cs"
147129
"${CMAKE_SOURCE_DIR}/Assets/FbxExporters/Editor/InstallIntegration.cs"
148-
"${CMAKE_SOURCE_DIR}/Assets/FbxExporters/Editor/ReviewLastSavedModel.cs"
149130
REFERENCES
150131
"${CSHARP_MSCORLIB_LIBRARY}"
151132
"${CSHARP_SYSTEM_CORE_LIBRARY}"
152133
"${CSHARP_SYSTEM_LIBRARY}"
153134
"${CSHARP_UNITYEDITOR_LIBRARY}"
154135
"${CSHARP_UNITYENGINE_LIBRARY}"
155136
"${CMAKE_SOURCE_DIR}/Assets/FbxExporters/FbxSdk/Plugins/UnityFbxSdk.dll"
156-
"${CLASS_LIBRARY_DEST}/${RUNTIME_CLASS_LIBRARY_NAME}"
157137
DEPENDS
158138
"${CLASS_LIBRARY_DEST}"
159-
UnityFbxExporterRuntimeDLL
160139
)
161140
add_custom_target(UnityFbxExporterEditorDLL ALL DEPENDS ${CLASS_LIBRARY_DEST}/${EDITOR_CLASS_LIBRARY_NAME})
162141

@@ -188,8 +167,8 @@ if(CMAKE_BUILD_TYPE STREQUAL "Release")
188167
PATTERN "Editor/FbxExporter.cs" EXCLUDE
189168
PATTERN "Editor/FbxExportSettings.cs" EXCLUDE
190169
PATTERN "Editor/InstallIntegration.cs" EXCLUDE
191-
PATTERN "Editor/ReviewLastSavedModel.cs" EXCLUDE)
192-
install(FILES ${CLASS_LIBRARY_DEST}/${RUNTIME_CLASS_LIBRARY_NAME} DESTINATION FbxExporters)
170+
PATTERN "Editor/ReviewLastSavedModel.cs" EXCLUDE
171+
PATTERN "Editor/EditorRotate.cs" EXCLUDE)
193172
install(FILES ${CLASS_LIBRARY_DEST}/${EDITOR_CLASS_LIBRARY_NAME} DESTINATION FbxExporters/Editor)
194173
else()
195174
install(DIRECTORY ${CMAKE_SOURCE_DIR}/Assets/FbxExporters

0 commit comments

Comments
 (0)