Skip to content

2024 debuglibs #535

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
Xyon wants to merge 12 commits into
base: main
Choose a base branch
from
Open

2024 debuglibs #535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ac86ddd
Allow for building with debug configuration; add workflow to produce …
Xyon Jan 1, 2025
ef08dd9
Add debug postfix; disable implied default incremental linking for de…
Xyon Jan 1, 2025
7a08852
Add missing endif()
Xyon Jan 1, 2025
220b43e
Remove debug postfix to resolve lua dependency not being found during…
Xyon Jan 1, 2025
c8f88b1
Incorporate DarkWander's pathfix for lua.exe
Xyon Jan 1, 2025
268d7e9
move penlight to follow Lua.exe for pl.class discovery
Xyon Jan 1, 2025
b068739
Put lfs with the lua utils so it can be found by dependents
Xyon Jan 1, 2025
c201195
Rename library PDB instead to avoid concurrency of access issue
Xyon Jan 1, 2025
64b3976
Revert "Put lfs with the lua utils so it can be found by dependents"
Xyon Jan 1, 2025
39c3a35
Revert moving penlight since lua move was also reverted
Xyon Jan 1, 2025
0102a98
Merge branch 'main' into 2024-debuglibs
Xyon Feb 11, 2025
a1e2052
We only produce x86 libs for the moment anyway, ignore x64 for now
Xyon Feb 11, 2025
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
9 changes: 1 addition & 8 deletions .github/workflows/debug.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
strategy:
fail-fast: false
matrix:
architecture: [x64, x86]
architecture: [x86]
with:
configuration: 'debug'
architecture: ${{ matrix.architecture }}
Expand All @@ -45,15 +45,9 @@ jobs:
name: Orbiter-x86
path: Orbiter-x86

- uses: actions/download-artifact@v4
with:
name: Orbiter-x64
path: Orbiter-x64

- run: |
find .
mv Orbiter-x86/Orbiter.zip Orbiter-x86-debug.zip
mv Orbiter-x64/Orbiter.zip Orbiter-x64-debug.zip

- name: "Create debug release"
uses: softprops/action-gh-release@v2
Expand All @@ -66,4 +60,3 @@ jobs:
name: Orbiter ${{ inputs.version }}
files: |
Orbiter-x86-debug.zip
Orbiter-x64-debug.zip
24 changes: 22 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ set(ldoc $<TARGET_FILE:lua::exe> ${ORBITER_BINARY_ROOT_DIR}/packages/LDoc/ldoc.l

find_package(OpenGL QUIET)
find_package(HTMLHelp)
find_package(LATEX)
find_package(LATEX)
find_package(MFC)

# We don't query Qt with find_package because we need the 64-bit version here
Expand All @@ -114,6 +114,10 @@ set(Qt5_x64_DIR
if(MSVC)
add_compile_options(/we4311 /DNOMINMAX)
add_link_options("/NODEFAULTLIB:\"LIBCMTD\"")
if (CMAKE_BUILD_TYPE STREQUAL "Debug")
# disable the implied default incremental linking for debug builds
add_link_options("/INCREMENTAL:NO")
endif()
else()
set(CMAKE_BUILD_WITH_INSTALL_RPATH true)
endif()
Expand Down Expand Up @@ -176,6 +180,22 @@ string(COMPARE NOTEQUAL ${ORBITER_PLANET_TEXTURE_INSTALL_DIR} "${ORBITER_BINARY_
if (${CUSTOM_PLANET_TEXTURE_DIR})
string(REPLACE "/" "\\" ORBITER_PLANET_TEXTURE_INSTALL_DIR_W "${ORBITER_PLANET_TEXTURE_INSTALL_DIR}")

if(BUILD_ORBITER_DX7)
configure_file(${ORBITER_SOURCE_DIR}/Orbiter.cfg.in ${ORBITER_BINARY_ROOT_DIR}/Orbiter.cfg)
install(FILES
${ORBITER_BINARY_ROOT_DIR}/Orbiter.cfg
DESTINATION ${ORBITER_INSTALL_ROOT_DIR}
)
endif()

if(BUILD_ORBITER_SERVER)
configure_file(${ORBITER_SOURCE_DIR}/Orbiter.cfg.in ${ORBITER_BINARY_ROOT_DIR}/Orbiter_NG.cfg)
install(FILES
${ORBITER_BINARY_ROOT_DIR}/Orbiter_NG.cfg
DESTINATION ${ORBITER_INSTALL_ROOT_DIR}
)
endif()

configure_file(${ORBITER_SOURCE_DIR}/Orbiter.cfg.in ${ORBITER_BINARY_ROOT_DIR}/Orbiter.cfg)
install(FILES ${ORBITER_BINARY_ROOT_DIR}/Orbiter.cfg DESTINATION ${ORBITER_INSTALL_ROOT_DIR})
endif()
Expand Down Expand Up @@ -301,7 +321,7 @@ endif()

configure_file(${CMAKE_SOURCE_DIR}/cmake/CPackOptions.cmake.in
${CMAKE_BINARY_DIR}/OrbiterCPackOptions.cmake)

set(CPACK_GENERATOR "WIX;ZIP")
set(CPACK_PACKAGE_NAME OpenOrbiter)
set(CPACK_PACKAGE_VENDOR Orbitersim)
Expand Down
2 changes: 1 addition & 1 deletion Extern/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ set_target_properties(lfs PROPERTIES

add_custom_target(CopyLDoc ALL
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/ldoc/ ${ORBITER_BINARY_ROOT_DIR}/packages/ldoc
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/Penlight/lua/ ${ORBITER_BINARY_ROOT_DIR}/
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/Penlight/lua/ ${ORBITER_BINARY_ROOT_DIR}
)
1 change: 1 addition & 0 deletions Extern/Lua/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ set_target_properties(lua PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY ${ORBITER_BINARY_ROOT_DIR}
LIBRARY_OUTPUT_DIRECTORY ${ORBITER_BINARY_ROOT_DIR}
RUNTIME_OUTPUT_DIRECTORY ${ORBITER_BINARY_ROOT_DIR}
COMPILE_PDB_NAME "lua_lib.pdb"
)
install(TARGETS lua DESTINATION ${ORBITER_INSTALL_ROOT_DIR})

Expand Down
Loading