diff --git a/.dockerignore b/.dockerignore deleted file mode 100644 index 4e76e597..00000000 --- a/.dockerignore +++ /dev/null @@ -1,33 +0,0 @@ -cmd/genbindings/cachedir - -*.exe - -cmd/handbindings/handbindings -cmd/handbindings/bindings_test/direct -cmd/handbindings/bindings_test/testapp -cmd/genbindings/genbindings -cmd/miqt-uic/miqt-uic -cmd/miqt-rcc/miqt-rcc - -examples/goroutine6/goroutine6 -examples/helloworld/helloworld -examples/helloworld6/helloworld6 -examples/mdoutliner/mdoutliner -examples/mdoutliner6/mdoutliner6 -examples/windowsmanifest/windowsmanifest -examples/uidesigner/uidesigner -examples/trivialwizard6/trivialwizard6 -examples/subclass/subclass -examples/modelview/modelview -examples/modelview_color6/modelview_color6 -examples/libraries/extras-scintillaedit/extras-scintillaedit -examples/libraries/qt-multimedia/qt-multimedia -examples/libraries/qt-network/qt-network -examples/libraries/qt-printsupport/qt-printsupport -examples/libraries/qt-script/qt-script -examples/libraries/qt-svg/qt-svg -examples/libraries/qt-webengine/qt-webengine -examples/libraries/qt-webkit/qt-webkit -examples/libraries/qt6-multimedia/qt6-multimedia -examples/libraries/qt6-webengine/qt6-webengine -examples/libraries/restricted-extras-qscintilla/restricted-extras-qscintilla diff --git a/README.md b/README.md index 101d39e5..adc21248 100644 --- a/README.md +++ b/README.md @@ -249,14 +249,14 @@ Static linking is also available by installing the `mingw-w64-ucrt-x86_64-qt5-st For static linking: 1. Build the necessary docker container for cross-compilation: - - `docker build -t miqt/win64-cross:latest -f docker/win64-cross-go1.23-qt5.15-static.Dockerfile .` + - In the `docker/` directory: docker build -t miqt/win64-cross:latest -f win64-cross-go1.23-qt5.15-static.Dockerfile .` 2. Build your application: - `docker run --rm -v $(pwd):/src -w /src miqt/win64-cross:latest go build --tags=windowsqtstatic -ldflags '-s -w -H windowsgui'` For dynamic linking: 1. Build the necessary docker container for cross-compilation: - - `docker build -t miqt/win64-dynamic:latest -f docker/win64-cross-go1.23-qt5.15-dynamic.Dockerfile .` + - In the `docker/` directory: `docker build -t miqt/win64-dynamic:latest -f win64-cross-go1.23-qt5.15-dynamic.Dockerfile .` 2. Build your application: - `docker run --rm -v $(pwd):/src -w /src miqt/win64-dynamic:latest go build -ldflags '-s -w -H windowsgui'` 3. Copy necessary Qt LGPL libraries and plugin files. @@ -303,7 +303,7 @@ Installing `qt@5` from Homebrew may be very slow if Homebrew chooses to do a fro For dynamic linking: 1. Build the necessary docker container for cross-compilation: - - `docker build -t miqt/osxcross:latest -f docker/macos-cross-x86_64-sdk14.5-go1.19-qt5.15-dynamic.Dockerfile .` + - In the `docker/` directory: `docker build -t miqt/osxcross:latest -f macos-cross-x86_64-sdk14.5-go1.19-qt5.15-dynamic.Dockerfile .` 2. Build your application: - `docker run --rm -v $(pwd):/src -w /src miqt/osxcross:latest go build -ldflags '-s -w'` 3. Copy necessary Qt LGPL libraries and plugin files.