Skip to content

Fix missing 2ship.o2r when debugging #1147

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
louist103 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fix missing 2ship.o2r when debugging #1147

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
10 changes: 1 addition & 9 deletions CMake/copy-existing-otrs.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,7 @@ if(EXISTS ${SOURCE_DIR}/mm/2ship.o2r)
message(STATUS "Copied 2ship.o2r")
endif()

# Additionally for Windows, copy the otrs to the target dir, side by side with 2ship.exe
if(SYSTEM_NAME MATCHES "Windows")
if(NOT ONLY2SHIPOTR AND EXISTS ${SOURCE_DIR}/mm/mm.o2r)
execute_process(COMMAND ${CMAKE_COMMAND} -E copy mm.o2r ${TARGET_DIR}/mm.o2r)
endif()
if(EXISTS ${SOURCE_DIR}/OTRExporter/2ship.o2r)
execute_process(COMMAND ${CMAKE_COMMAND} -E copy 2ship.o2r ${TARGET_DIR})
endif()
endif()


if(NOT ONLY2SHIPOTR AND (NOT EXISTS ${SOURCE_DIR}/mm.o2r))
message(FATAL_ERROR "Failed to copy. No O2R files found.")
Expand Down
2 changes: 1 addition & 1 deletion mm/2s2h/BenPort.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ OTRGlobals::OTRGlobals() {
}
}

std::string shipOtrPath = Ship::Context::GetPathRelativeToAppBundle("2ship.o2r");
std::string shipOtrPath = Ship::Context::LocateFileAcrossAppDirs("2ship.o2r");
if (std::filesystem::exists(shipOtrPath)) {
archiveFiles.push_back(shipOtrPath);
}
Expand Down
Loading