search

MrGlockenspiel / activate-linux

The "Activate Windows" watermark ported to Linux
GNU General Public License v3.0
4.25k stars 91 forks source link

Fix build #123

Closed Nefsen402 closed 2 years ago

Nefsen402 commented 2 years ago

Commit 04b2c19bf9e90ade3ff5d9984ace60dafe13c3ce and 8133711f8d1148e9f35594567e60a0f4e46c8dd5 added new command line switches however, 45a8fa014627dcd6154569721840a873c8f77f5a moves them into a a struct without updating the new switches.

/cc @MrGlockenspiel

MrGlockenspiel commented 2 years ago

This is what i get for not testing i suppose

Nefsen402 commented 2 years ago

Please let me know if you have issues with the wayland patches. I am willing to move the build system over to meson so that the program is automatically built with whatever is available on the system (e.g. wayland won't be built if there are no wayland libraries on the system). But I think most people will have libwayland on their system so I kept the make file relatively unchanged.

Github actions could be implemented so that a bad rebase/merge is less likely to happen.

Nefsen402 commented 2 years ago

To be clear - #120 #121 - both those PRs were fine on their own, the automatic merge just didn't do the proper thing.