Skip to content

Commit b0e4794

Browse files
committed
compile FbxExporter and dependencies
compile FbxExporter and all the classes it depends on, which are: -FbxExportSettings -InstallIntegration -ReviewLastSavedModel -FbxTurnTableBase Note: FbxTurnTableBase has to be compiled into a separate DLL because we want to keep it out of the editor folder Note: Integration class had to be made public so it could be accessed by the tests once its in the DLL
1 parent 14f9c7d commit b0e4794

File tree

2 files changed

+15
-42
lines changed

2 files changed

+15
-42
lines changed

Assets/FbxExporters/Editor/InstallIntegration.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
namespace FbxExporters.Editor
77
{
8-
class Integrations
8+
public class Integrations
99
{
1010
private const string MODULE_FILENAME = "unityoneclick";
1111
private const string PACKAGE_NAME = "FbxExporters";

CMakeLists.txt

Lines changed: 14 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -109,82 +109,55 @@ add_custom_target(
109109
# Compile editor scripts into a multi-platform DLL
110110
if("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
111111
set(CLASS_LIBRARY_DEST "${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE}")
112-
set(CLASS_LIBRARY_NAME "UnityFbxExporter.dll")
112+
set(RUNTIME_CLASS_LIBRARY_NAME "UnityFbxExporter.dll")
113113

114114
add_custom_command(OUTPUT ${CLASS_LIBRARY_DEST}
115115
COMMAND ${CMAKE_COMMAND} -E make_directory ${CLASS_LIBRARY_DEST}
116116
)
117117

118-
fbxexporters_compile_csharp(OUTPUT ${CLASS_LIBRARY_DEST}/${CLASS_LIBRARY_NAME}
118+
fbxexporters_compile_csharp(OUTPUT ${CLASS_LIBRARY_DEST}/${RUNTIME_CLASS_LIBRARY_NAME}
119119
EXTRA_ARGS
120120
"/target:library"
121121
SOURCES
122-
"${CMAKE_SOURCE_DIR}/Assets/FbxExporters/FbxPrefab.cs"
123-
#"${CMAKE_SOURCE_DIR}/Assets/FbxExporters/Editor/ConvertToModel.cs"
124-
#"${CMAKE_SOURCE_DIR}/Assets/FbxExporters/Editor/FbxExporter.cs"
125-
#"${CMAKE_SOURCE_DIR}/Assets/FbxExporters/Editor/FbxExportSettings.cs"
126-
#"${CMAKE_SOURCE_DIR}/Assets/FbxExporters/Editor/FbxPrefabAutoUpdater.cs"
127-
#"${CMAKE_SOURCE_DIR}/Assets/FbxExporters/Editor/FbxPrefabInspector.cs"
128-
#"${CMAKE_SOURCE_DIR}/Assets/FbxExporters/Editor/InstallIntegration.cs"
129-
#"${CMAKE_SOURCE_DIR}/Assets/FbxExporters/Editor/ReviewLastSavedModel.cs"
122+
"${CMAKE_SOURCE_DIR}/Assets/FbxExporters/FbxTurnTableBase.cs"
130123
REFERENCES
131124
"${CSHARP_MSCORLIB_LIBRARY}"
132125
"${CSHARP_SYSTEM_CORE_LIBRARY}"
133126
"${CSHARP_SYSTEM_LIBRARY}"
134127
"${CSHARP_UNITYEDITOR_LIBRARY}"
135128
"${CSHARP_UNITYENGINE_LIBRARY}"
136129
"${CMAKE_SOURCE_DIR}/Assets/FbxExporters/FbxSdk/Plugins/UnityFbxSdk.dll"
137-
#"${CMAKE_SOURCE_DIR}/Assets/FbxExporters/FbxTurnTableBase.cs"
138130
DEPENDS
139131
"${CLASS_LIBRARY_DEST}"
140132
)
141-
add_custom_target(UnityFbxExporterDLL ALL DEPENDS ${CLASS_LIBRARY_DEST}/${CLASS_LIBRARY_NAME})
142-
133+
add_custom_target(UnityFbxExporterRuntimeDLL ALL DEPENDS ${CLASS_LIBRARY_DEST}/${RUNTIME_CLASS_LIBRARY_NAME})
143134

144-
#set(CLASS_LIBRARY_NAME_3 "UnityFbxExporterSettings.dll")
145-
#fbxexporters_compile_csharp(OUTPUT ${CLASS_LIBRARY_DEST}/${CLASS_LIBRARY_NAME_3}
146-
# EXTRA_ARGS
147-
# "/target:library"
148-
# SOURCES
149-
# "${CMAKE_SOURCE_DIR}/Assets/FbxExporters/Editor/FbxExportSettings.cs"
150-
# REFERENCES
151-
# "${CSHARP_MSCORLIB_LIBRARY}"
152-
# "${CSHARP_SYSTEM_CORE_LIBRARY}"
153-
# "${CSHARP_SYSTEM_LIBRARY}"
154-
# "${CSHARP_UNITYEDITOR_LIBRARY}"
155-
# "${CSHARP_UNITYENGINE_LIBRARY}"
156-
# "${CMAKE_SOURCE_DIR}/Assets/FbxExporters/FbxSdk/Plugins/UnityFbxSdk.dll"
157-
# DEPENDS
158-
# "${CLASS_LIBRARY_DEST}"
159-
#)
160-
#add_custom_target(UnityFbxSettingsDLL ALL DEPENDS ${CLASS_LIBRARY_DEST}/${CLASS_LIBRARY_NAME_3})
161-
162-
set(CLASS_LIBRARY_NAME_2 "UnityFbxExporterEditor.dll")
163-
fbxexporters_compile_csharp(OUTPUT ${CLASS_LIBRARY_DEST}/${CLASS_LIBRARY_NAME_2}
135+
set(EDITOR_CLASS_LIBRARY_NAME "UnityFbxExporterEditor.dll")
136+
fbxexporters_compile_csharp(OUTPUT ${CLASS_LIBRARY_DEST}/${EDITOR_CLASS_LIBRARY_NAME}
164137
EXTRA_ARGS
165138
"/target:library"
166139
SOURCES
167140
#"${CMAKE_SOURCE_DIR}/Assets/FbxExporters/Editor/*.cs"
168-
"${CMAKE_SOURCE_DIR}/Assets/FbxExporters/Editor/ConvertToModel.cs"
141+
#"${CMAKE_SOURCE_DIR}/Assets/FbxExporters/Editor/ConvertToModel.cs"
169142
"${CMAKE_SOURCE_DIR}/Assets/FbxExporters/Editor/FbxExporter.cs"
170-
#"${CMAKE_SOURCE_DIR}/Assets/FbxExporters/Editor/FbxExportSettings.cs"
171-
"${CMAKE_SOURCE_DIR}/Assets/FbxExporters/Editor/FbxPrefabAutoUpdater.cs"
143+
"${CMAKE_SOURCE_DIR}/Assets/FbxExporters/Editor/FbxExportSettings.cs"
144+
#"${CMAKE_SOURCE_DIR}/Assets/FbxExporters/Editor/FbxPrefabAutoUpdater.cs"
172145
#"${CMAKE_SOURCE_DIR}/Assets/FbxExporters/Editor/FbxPrefabInspector.cs"
173-
#"${CMAKE_SOURCE_DIR}/Assets/FbxExporters/Editor/InstallIntegration.cs"
174-
#"${CMAKE_SOURCE_DIR}/Assets/FbxExporters/Editor/ReviewLastSavedModel.cs"
146+
"${CMAKE_SOURCE_DIR}/Assets/FbxExporters/Editor/InstallIntegration.cs"
147+
"${CMAKE_SOURCE_DIR}/Assets/FbxExporters/Editor/ReviewLastSavedModel.cs"
175148
REFERENCES
176149
"${CSHARP_MSCORLIB_LIBRARY}"
177150
"${CSHARP_SYSTEM_CORE_LIBRARY}"
178151
"${CSHARP_SYSTEM_LIBRARY}"
179152
"${CSHARP_UNITYEDITOR_LIBRARY}"
180153
"${CSHARP_UNITYENGINE_LIBRARY}"
181154
"${CMAKE_SOURCE_DIR}/Assets/FbxExporters/FbxSdk/Plugins/UnityFbxSdk.dll"
182-
"${CLASS_LIBRARY_DEST}/${CLASS_LIBRARY_NAME}"
155+
"${CLASS_LIBRARY_DEST}/${RUNTIME_CLASS_LIBRARY_NAME}"
183156
DEPENDS
184157
"${CLASS_LIBRARY_DEST}"
185-
UnityFbxExporterDLL
158+
UnityFbxExporterRuntimeDLL
186159
)
187-
add_custom_target(UnityFbxExporterEditorDLL ALL DEPENDS ${CLASS_LIBRARY_DEST}/${CLASS_LIBRARY_NAME_2})
160+
add_custom_target(UnityFbxExporterEditorDLL ALL DEPENDS ${CLASS_LIBRARY_DEST}/${EDITOR_CLASS_LIBRARY_NAME})
188161

189162
endif()
190163

0 commit comments

Comments
 (0)