Skip to content

Merge in the last year of work#61

Open
JoeHCQ1 wants to merge 92 commits intomasterfrom
dev-v2.4
Open

Merge in the last year of work#61
JoeHCQ1 wants to merge 92 commits intomasterfrom
dev-v2.4

Conversation

@JoeHCQ1
Copy link
Copy Markdown
Contributor

@JoeHCQ1 JoeHCQ1 commented Nov 1, 2022

@kshomper, this PR has all the work from the last year. I realize this is a horribly non-agile way to do this, but for some reason me a year ago wanted to batch changes.

Here are the main changes/additions/improvements:

  1. WxWidgets has been updated to wxWidgets 3.2
  2. CedarLogic now predictably builds in a Linux environment
  3. Build and related instructions have been improved
  4. Multiple smaller code changes related to the update to the latest wxWidgets version.

Much of this code is thanks to @ArenM and @HRahikainen.

  • I do not recommend yet changing the minor version, this is all still patching I believe. So v2.3.8 is more appropriate than v2.4.0
  • There are definitely still things to do in the code-base, but I'd prefer to get these changes in, and move toward smaller batch sizes.

@JoeHCQ1 JoeHCQ1 requested a review from kshomper November 1, 2022 01:46
@JoeHCQ1 JoeHCQ1 self-assigned this Nov 1, 2022
Comment thread include/gui/MainApp.h
Comment thread include/gui/klsMiniMap.h Outdated
Comment thread logic/src/logic_event.cpp Outdated
Comment thread logic/src/logic_wire.cpp Outdated
Comment thread logic/src/logic_wire.cpp Outdated
kshomper
kshomper previously approved these changes Nov 1, 2022
Copy link
Copy Markdown
Collaborator

@kshomper kshomper left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JoeHCQ1 There are too many changes for me to evaluate them entirely; however, I trust your judgement and would like not to be a bottleneck to the activity. I also want to convey my appreciation also to @ArenM and @HRahikainen for their contributions, particularly the efforts to make CedarLogic cross platform.

@kshomper
Copy link
Copy Markdown
Collaborator

kshomper commented Nov 1, 2022

@JoeHCQ1 I have read through your comments and recommendation. Thank you for summarizing them so effectively.

@casanova-uja
Copy link
Copy Markdown

3. d instruc

It's imposible to run cmake -B build -A Win32 from VS developer command prompt, it gives me an error when try to download wxWidgets. I have installed and compiled wxWidgets manually and the error continues.

Please, give better instructions to build, last version instructions was fine.

@ArenM
Copy link
Copy Markdown

ArenM commented Mar 4, 2023

@casanova-uja could you provided the error it gave you? It works fine for me, it's possible I set something else up and then forgot about it though.

Kevinjil and others added 2 commits February 28, 2024 11:07
More information in issue catchorg/Catch2#2712
on GitHub.
Update Catch2 to fix build issues
@JoeHCQ1 JoeHCQ1 requested a review from kshomper March 4, 2024 17:12
@JoeHCQ1
Copy link
Copy Markdown
Contributor Author

JoeHCQ1 commented Mar 4, 2024

@kshomper if you can click the green "approve" button I'll get these changes merged in and turn towards resolving bugs. (As I contributed code I can't click the green approve button and without it clicked I can't merge)

@kshomper
Copy link
Copy Markdown
Collaborator

kshomper commented Apr 2, 2024

Joe ... As requested. Thanks for all your oversight on this. Keith

@kshomper
Copy link
Copy Markdown
Collaborator

kshomper commented Apr 2, 2024 via email

@brennenputh
Copy link
Copy Markdown

I recently stumbled across this PR while attempting to modify the CedarLogic codebase. The build on the main branch seems to be broken and this PR works (at least on my Linux machine and my roommate's Windows machine), so it would be appreciated to merge the PR if it is ready.

@taciturnaxolotl
Copy link
Copy Markdown

taciturnaxolotl commented Aug 14, 2025

just tested it myself on nixos (NixOS 25.05.20250809.c5f08b6 (Warbler) x86_64 and nixpkgs-unstable 005433b926e16227259a1843015b5b2b7f7d1fc3) and I can confirm basic features working as expected; this getting merged would be awesome as I'm going to submit a pr to nixpkgs soon and would love to not deal with branch breakage in the future

image

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants