Skip to content
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.

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

Updates the torsion.in file to properly be configured to handle tscript extension #477

Merged

Conversation

Areloch
Copy link
Contributor

@Areloch Areloch commented Mar 14, 2021

No description provided.

@lukaspj lukaspj added C++ Issue is engine code specific Script Issue as part of template/module script labels Apr 8, 2021
@JeffProgrammer
Copy link
Member

@Areloch Does the CMake build system have a variable that sets the TS script extension? Since this is a cmake.in file, we should use that variable instead of hardcoding it if it does. If it doesn't, then this is good to merge.

@lukaspj
Copy link
Contributor

lukaspj commented Apr 13, 2021

Ah yeah that makes sense. It does have such a variable TORQUE_SCRIPT_EXTENSION

@@ -1,18 +1,14 @@
<TorsionProject>
<Name>@TORQUE_APP_NAME@</Name>
<WorkingDir/>
<EntryScript>main.cs</EntryScript>
<EntryScript>main.tscript</EntryScript>
Copy link
Contributor

@Azaezel Azaezel May 11, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

<EntryScript>main.@TORQUE_SCRIPT_EXTENSION@</EntryScript>

<Folder>data</Folder>
<Folder>tools</Folder>
</Mods>
<ScannerExts>cs; gui; taml; module;</ScannerExts>
<ScannerExts>cs; gui; taml; module; tscript;</ScannerExts>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

<ScannerExts>@TORQUE_SCRIPT_EXTENSION@; gui; taml; module;</ScannerExts>

Azaezel added a commit to Azaezel/Torque3D-1 that referenced this pull request May 14, 2021
@Azaezel Azaezel merged commit 89e76f9 into TorqueGameEngines:Preview4_0 May 14, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C++ Issue is engine code specific Script Issue as part of template/module script
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants