Skip to content

Add LINUX_BUILD Definition to support linux without destructing others #185

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: Houdini18.5-4.27
Choose a base branch
from
Open

Add LINUX_BUILD Definition to support linux without destructing others #185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,4 +105,5 @@ However, the Houdini Digital Assets themselves (the HDA files), that were create
01. You should now be able to import Houdini Digital Assets (HDA) `.otl` or `.hda` files or drag and drop them into the `Content Browser`.
01. Once you have an HDA in the `Content Browser` you should be able to drag it into the Editor viewport. This will spawn a new Houdini Asset Actor. Geometry cooking will be done in a separate thread and geometry will be displayed once the cooking is complete. At this point you will be able to see asset parameters in the `Details` pane. Modifying any of the parameters will force the asset to recook and possibly update its geometry.


# Building on Linux
If you are using `RunUAT.sh` on Linux distributions, you should add `-Definition=LINUX_BUILD` to your command.
7 changes: 6 additions & 1 deletion Source/HoudiniEngine/Private/HoudiniEngine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,12 @@
#include "Engine/StaticMesh.h"
#include "Materials/Material.h"
#include "ISettingsModule.h"
#include "HAL/PlatformFilemanager.h"
#ifdef LINUX_BUILD
#include "HAL/PlatformFileManager.h"
#else
#include "HAL/PlatformFilemanager.h"
#endif

#include "Async/Async.h"
#include "Logging/LogMacros.h"

Expand Down
8 changes: 6 additions & 2 deletions Source/HoudiniEngine/Private/HoudiniOutputTranslator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,11 @@
#include "EditorSupportDelegates.h"
#include "FileHelpers.h"
#include "LandscapeInfo.h"
#include "HAL/PlatformFilemanager.h"
#ifdef LINUX_BUILD
#include "HAL/PlatformFileManager.h"
else
#include "HAL/PlatformFilemanager.h"
#endif
#include "HAL/FileManager.h"
#include "Engine/WorldComposition.h"
#include "Modules/ModuleManager.h"
Expand Down Expand Up @@ -2392,4 +2396,4 @@ FHoudiniOutputTranslator::GetTempFolderFromAttribute(UHoudiniAssetComponent * HA
HAC->TemporaryCookFolder.Path = TempFolderOverride;
}

#undef LOCTEXT_NAMESPACE
#undef LOCTEXT_NAMESPACE
6 changes: 5 additions & 1 deletion Source/HoudiniEngineEditor/Private/HoudiniEngineEditor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,11 @@

#include "Modules/ModuleManager.h"
#include "Interfaces/IPluginManager.h"
#include "HAL/PlatformFilemanager.h"
#ifdef LINUX_BUILD
#include "HAL/PlatformFileManager.h"
else
#include "HAL/PlatformFilemanager.h"
#endif
#include "Misc/MessageDialog.h"
#include "Misc/Paths.h"
#include "AssetRegistryModule.h"
Expand Down
6 changes: 5 additions & 1 deletion Source/HoudiniEngineEditor/Private/Tests/HoudiniEditorTestUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,11 @@
#include "LevelEditor.h"
#include "AssetRegistryModule.h"
#include "Core/Public/HAL/FileManager.h"
#include "Core/Public/HAL/PlatformFilemanager.h"
#ifdef LINUX_BUILD
#include "Core/Public/HAL/PlatformFileManager.h"
#else
#include "Core/Public/HAL/PlatformFilemanager.h"
#endif
#include "Editor/EditorPerformanceSettings.h"
#include "Engine/Selection.h"
#include "Interfaces/IMainFrameModule.h"
Expand Down