search

JoeStrout / miniscript

source code of both C# and C++ implementations of the MiniScript scripting language
MIT License
280 stars 64 forks source link

Fix editline include #121

Closed MineRobber9000 closed 8 months ago

MineRobber9000 commented 8 months ago

Fixes the include path for editline. Also, removing the os9 editline file from the list of source files so it won't cause errors.

JoeStrout commented 8 months ago

This is probably redundant with branch 1.6.2. But I'll wait to confirm that before closing this.

MineRobber9000 commented 8 months ago

That depends-- how close do you think 1.6.2 is to being released? Because until 1.6.2 is released, this fixes the building process for the current MiniScript version. Unless 1.6.2 is coming out tomorrow, I think it'd be worthwhile to fix the 1.6.1 build.

JoeStrout commented 8 months ago

It really should be a matter of weeks now. And merging this into main would cause a conflict when I try to merge the 1.6.2 branch... and I don't need any more hurdles in the way of getting 1.6.2 out the door! :)

MineRobber9000 commented 8 months ago

With this latest change, it shouldn't cause a merge conflict (assuming #122 gets merged into v1.6.2 before v1.6.2 gets merged into main).

MineRobber9000 commented 8 months ago

If you want to merge this I can reopen it but seeing as 1.6.2 is supposedly close it won't matter anyways.