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

23 disable dx7 on x64 #25

Merged
merged 7 commits into from
Aug 1, 2021
Merged

23 disable dx7 on x64 #25

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4db40e4
#23: building inline graphics version is now disabled for 64-bit builds.
mschweiger Aug 1, 2021
30dc124
#23: removed D3D7Client from 64-bit build. Removed superfluous DX7 re…
mschweiger Aug 1, 2021
64003c5
#23: graphics server version now only links dinput7, but no longer dd…
mschweiger Aug 1, 2021
dc97e06
#23: replaced dx7 version of dxguid.lib with system version. Builds a…
mschweiger Aug 1, 2021
7f5aa30
#23: replaced dinput7 with dinput8 while keeping dx7 for graphics. Su…
mschweiger Aug 1, 2021
3df4b5a
#23: added 64-bit Lua binaries (borrowed from Face's repository :). F…
mschweiger Aug 1, 2021
cbd44e1
#23: added htmlhelp files.
mschweiger Aug 1, 2021
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
Prev Previous commit
Next Next commit
#23: replaced dx7 version of dxguid.lib with system version. Builds a… 
…nd doesn't seem to cause problems in the simulation, so I assume that this is ok. Preparation for migration from dinput7 to dinput8.
  • Loading branch information
@mschweiger
mschweiger committed Aug 1, 2021
commit dc97e0658e8952de120301e206949e016d70b1ef
2 changes: 1 addition & 1 deletion OVP/D3D7Client/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ target_link_libraries(D3D7Client
${ORBITER_LIB}
${ORBITER_SDK_LIB}
${GDICLIENT_LIB}
${DX7SDK_LIB_DIR}/dxguid.lib
dxguid.lib
${DX7SDK_LIB_DIR}/d3dim.lib
${DX7SDK_LIB_DIR}/ddraw.lib
)
Expand Down
4 changes: 2 additions & 2 deletions Src/Orbiter/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,13 +167,13 @@ set(Orbiter_common_libs
$<TARGET_FILE:DlgCtrl>
)
set(Orbiter_dx7_libs
${DX7SDK_LIB_DIR}/dxguid.lib
dxguid.lib
${DX7SDK_LIB_DIR}/d3dim.lib
${DX7SDK_LIB_DIR}/ddraw.lib
${DX7SDK_LIB_DIR}/dinput.lib
)
set(Orbiter_server_libs
${DX7SDK_LIB_DIR}/dxguid.lib
dxguid.lib
${DX7SDK_LIB_DIR}/dinput.lib
)

Expand Down