Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion BUILDING_LINUX.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,6 @@ From the project root:
cmake --build build --parallel
QMAKE=/usr/lib/qt6/bin/qmake6 cmake --build build --target appimage

This produces `build/DISSCO-<version>-Linux-<arch>.AppImage` — a self-contained executable with Qt, libsndfile, and CMOD bundled in. It runs on most modern Linux distros without further installation.
This produces `build/DISSCO-<version>-Linux-<arch>.AppImage` — a self-contained executable with Qt, libsndfile, and the `cmod` executable bundled in. Its desktop launcher runs `lassie`, and the AppImage works on most modern Linux distros without further installation.

The first invocation downloads `linuxdeploy` and `linuxdeploy-plugin-qt` into `build/.linuxdeploy/`. The icon (`packaging/linux/LASSIE.png`) is a placeholder; replace it with real artwork before cutting a release.
2 changes: 1 addition & 1 deletion BUILDING_MACOS.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ From the project root:
cmake --build build --parallel
cmake --build build --target package

This produces `build/DISSCO-<version>-Darwin.dmg`. The DMG contains `LASSIE.app` with the CMOD binary embedded at `Contents/MacOS/CMOD` and Qt frameworks bundled in via `macdeployqt`.
This produces `build/DISSCO-<version>-Darwin.dmg`. The DMG contains `lassie.app` with the `cmod` binary embedded at `Contents/MacOS/cmod` and Qt frameworks bundled in via `macdeployqt`.

The build's icon (`packaging/macos/LASSIE.icns`) is a placeholder; regenerate it from updated artwork via `packaging/macos/make-icns.sh`.

Expand Down
16 changes: 8 additions & 8 deletions BUILDING_WINDOWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -280,15 +280,15 @@ cmake --build build --parallel
A successful build should produce:

```text
%DISSCO_ROOT%\build\CMOD\CMOD.exe
%DISSCO_ROOT%\build\LASSIE\LASSIE.exe
%DISSCO_ROOT%\build\CMOD\cmod.exe
%DISSCO_ROOT%\build\LASSIE\lassie.exe
```

Verify:

```cmd
dir "%DISSCO_ROOT%\build\CMOD\CMOD.exe"
dir "%DISSCO_ROOT%\build\LASSIE\LASSIE.exe"
dir "%DISSCO_ROOT%\build\CMOD\cmod.exe"
dir "%DISSCO_ROOT%\build\LASSIE\lassie.exe"
```

Run LASSIE
Expand All @@ -297,15 +297,15 @@ Run LASSIE
Run:

```cmd
"%DISSCO_ROOT%\build\LASSIE\LASSIE.exe"
"%DISSCO_ROOT%\build\LASSIE\lassie.exe"
```

If LASSIE opens, the GUI build is working.

If Windows reports missing Qt DLLs, run:

```cmd
"%QT_ROOT%\bin\windeployqt.exe" "%DISSCO_ROOT%\build\LASSIE\LASSIE.exe"
"%QT_ROOT%\bin\windeployqt.exe" "%DISSCO_ROOT%\build\LASSIE\lassie.exe"
```

Then run LASSIE again.
Expand All @@ -316,7 +316,7 @@ Run CMOD Manually
CMOD can be run directly with a `.dissco` file:

```cmd
"%DISSCO_ROOT%\build\CMOD\CMOD.exe" "<path-to-project>\your_file.dissco"
"%DISSCO_ROOT%\build\CMOD\cmod.exe" "<path-to-project>\your_file.dissco"
```

Generate Score Output
Expand Down Expand Up @@ -374,7 +374,7 @@ The script automatically:

The target computer only needs 64-bit Windows 10 or Windows 11. It does not
need Qt, LilyPond, Visual Studio, the Visual C++ Redistributable, or
administrator access. Extract the complete ZIP and double-click `LASSIE.exe`;
administrator access. Extract the complete ZIP and double-click `lassie.exe`;
`Run-DISSCO.bat` remains available as a compatibility launcher.

For non-default paths or automation, run the PowerShell entry point directly:
Expand Down
11 changes: 9 additions & 2 deletions CMOD/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ target_include_directories(ModifierUsage PUBLIC
target_compile_features(ModifierUsage PUBLIC cxx_std_20)

add_executable(CMOD ${CMOD_SRC})
set(CMOD_EXECUTABLE_BASENAME "cmod")
set_target_properties(CMOD PROPERTIES
OUTPUT_NAME "${CMOD_EXECUTABLE_BASENAME}"
)
# CMOD is consumed by LASSIE as a standalone subprocess (QProcess::start),
# not linked into it. No ENABLE_EXPORTS / WINDOWS_EXPORT_ALL_SYMBOLS is
# needed — and adding them just to "make the link work" backfires on
Expand Down Expand Up @@ -63,15 +67,18 @@ endif()

# set "default" location of the CMOD binary (directory) for use in LASSIE
if(NOT CMOD_BINARY)
set(CMOD_BINARY "${CMAKE_CURRENT_BINARY_DIR}/CMOD" PARENT_SCOPE)
set(CMOD_BINARY
"${CMAKE_CURRENT_BINARY_DIR}/${CMOD_EXECUTABLE_BASENAME}"
PARENT_SCOPE
)
message(STATUS "CMOD_BINARY set")
endif()
message(STATUS "CMOD_BINARY set to ${CMOD_BINARY}")

include(GNUInstallDirs)
if(APPLE)
install(TARGETS CMOD
RUNTIME DESTINATION LASSIE.app/Contents/MacOS
RUNTIME DESTINATION lassie.app/Contents/MacOS
COMPONENT Runtime
)
else()
Expand Down
File renamed without changes.
Loading
Loading