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.

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

Jump to bottom

Windows x64 build #354

Merged
merged 16 commits into from
May 22, 2024
Merged

Windows x64 build #354

merged 16 commits into from
May 22, 2024

Conversation

pzychotic
Copy link
Contributor

@pzychotic pzychotic commented May 15, 2024 •
edited

Pull Request Type

  • GitHub Workflow changes
  • Documentation or Wiki changes
  • Build and Dependency changes
  • Runtime changes
    • Render changes
    • Audio changes
    • Input changes
    • Network changes
    • Other changes

Description

Getting this out as a starting point for a possible Windows x64 build.

So far my local tests in Singleplayer work fine. I haven't tried any Multiplayer.

Quick summary:

  • DirectX SDK updated with x64 support
  • Prevent 32bit truncations of WinApi types
  • Compilation of scripts and netgames projects

Cut corners:

  • Disabled callstack and exception info logging: pzychotic@caf1981
    • Maybe this can be replaced with writing a MiniDump file nowadays?
  • Disabled some code for 'mono' debugger: pzychotic@bac882c
    • Do we even still need this?

Open questions:

  • I had to load the new d3-win.hog last so the x64 DLLs from it will be found before the x86 DLLs from the original game data: pzychotic@435b1f4
    • Shouldn't this also be done for Linux/Mac?
  • Array access with negative index in dsound3d.cpp only crashes in x64: pzychotic@11af2e7
    • This problem is already present in x86 builds, but doesn't crash...

Known Issue:

Checklist

  • I have tested my changes locally and verified that they work as intended.
  • I have documented any new or modified functionality.
  • I have reviewed the changes to ensure they do not introduce any unnecessary complexity or duplicate code.
  • I understand that by submitting this pull request, I am agreeing to license my contributions under the project's license.

@pzychotic
[DirectX] Updated DirectX SDK to August 2007 version.
2e4d25e 
This is one of the last versions still containing DirectDraw + DirectSound and also has x64 support.
@pzychotic
[Win,x64] Removed unused code that won't compile in x64.
0b87752
@pzychotic
[Win,x64] Disabled callstack and exception info logging due to compil…
caf1981 
…e errors in x64.
@pzychotic
[Win,x64] Disabled some 'mono' debugger stuff due to compile errors i…
bac882c 
…n x64.
@pzychotic
[Win,x64] Fixed WinApi types and function calls.
6ecafd9 
Lots of these truncated 64bit pointer or handle types to 32bit.
@pzychotic
[Win,x64] Replaced inline assembly for int3 with debug_break() to fix…
0c09eed 
… compile errors in x64 builds.
@pzychotic
[Win,x64] Activated the compilation of scripts and netgames for Windows.
57c8347 
We now need native x64 versions of it.
@pzychotic
[Scripts] Dllexport script entry points.
1bf8473
@pzychotic
[Win,hog] Load the newly created d3-win.hog after all other hog files…
435b1f4 
… from the original game.

The last library opened with cf_OpenLibrary() will be the first to be searched for DLLs. This way we make sure to load our x64 DLLs before the x86 versions from the original game data.
@pzychotic
[Sound] Fixed array access with negative m_sound_index.
11af2e7 
No idea why this doesn't crash in current builds, maybe just corrupts some memory if we get into if-statement?!
@Lgt2x
Copy link
Collaborator

Lgt2x commented May 15, 2024

Hey, that looks promising! Just so you know, we will be working on replacing DirectX with SDL2 on Windows just like Linux and MacOS do, so don't spend too much effort on the DirectX code

@Lgt2x Lgt2x mentioned this pull request May 15, 2024
Merged
13 tasks
@pzychotic
Copy link
Contributor Author

Hey, that looks promising! Just so you know, we will be working on replacing DirectX with SDL2 on Windows just like Linux and MacOS do, so don't spend too much effort on the DirectX code

Thanks for the heads-up on DirectX stuff. I wasn't planning spending time on it, just replaced the SDK for the x64 support to get the current stuff to compile and run.

@JeodC JeodC added the build Modification to the build system label May 15, 2024
@MaddTheSane
Copy link
Contributor

  • I had to load the new d3-win.hog last so the x64 DLLs from it will be found before the x86 DLLs from the original game data:pzychotic@435b1f4

    • Shouldn't this also be done for Linux/Mac?

Maybe for Linux, but macOS can have multiple architectures in one binary.

@pzychotic
Merge branch 'main' into win-x64
7033fd5 
# Conflicts:
#	lib/win/win32app.h
#	win32/winapp.cpp
@pzychotic pzychotic mentioned this pull request May 19, 2024
Closed
20 tasks
@GravisZro GravisZro mentioned this pull request May 19, 2024
Merged
12 tasks
@pzychotic pzychotic marked this pull request as ready for review May 19, 2024 17:49
JeodC
JeodC reviewed May 19, 2024
View reviewed changes
CMakeLists.txt Show resolved Hide resolved
@JeodC JeodC requested a review from jcoby May 20, 2024 19:35
This was linked to issues May 20, 2024
[Runtime Issue]: Newly built dmfc.dll and gamemodes crash #312
Closed
Ping and Network Loss Meter not working #213
Closed
@JeodC JeodC requested a review from winterheart May 20, 2024 23:20
@JeodC JeodC requested a review from Lgt2x May 20, 2024 23:20
@JeodC
Copy link
Collaborator

JeodC commented May 21, 2024

I can't review further, other than verifying it works in windows, but I'd like to note that as pzychotic nicely explained, this pull will resolve the outstanding multiplayer issues.

@pzychotic pzychotic mentioned this pull request May 21, 2024
Closed
13 tasks
winterheart
winterheart reviewed May 22, 2024
View reviewed changes
Copy link
Collaborator

@winterheart winterheart left a comment

Choose a reason for hiding this comment

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

We need additionally mention somewhere that we use static DirectX libraries (and here issue about licensing them with GPLv3 code).

CMakeLists.txt Outdated Show resolved Hide resolved
Descent3/init.cpp Outdated Show resolved Hide resolved
@pzychotic
Copy link
Contributor Author

We need additionally mention somewhere that we use static DirectX libraries (and here issue about licensing them with GPLv3 code).

These are not static libraries, these are just the link libs needed by the linker to resolve the symbols to the DLLs.

winterheart
winterheart approved these changes May 22, 2024
View reviewed changes
Copy link
Collaborator

@winterheart winterheart left a comment

Choose a reason for hiding this comment

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

OK from me. Good work!

@winterheart winterheart added this to the 1.5 Stable milestone May 22, 2024
@winterheart winterheart merged commit 764b84d into DescentDevelopers:main May 22, 2024
10 checks passed
@JeodC JeodC mentioned this pull request May 22, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@winterheart winterheart winterheart approved these changes

@JeodC JeodC JeodC approved these changes

@jcoby jcoby Awaiting requested review from jcoby

@Lgt2x Lgt2x Awaiting requested review from Lgt2x

Assignees
No one assigned
Labels
build Modification to the build system
Projects
None yet
Milestone
1.5 Stable
Development

Successfully merging this pull request may close these issues.

[Runtime Issue]: Newly built dmfc.dll and gamemodes crash Ping and Network Loss Meter not working
5 participants
@pzychotic @Lgt2x @MaddTheSane @JeodC @winterheart