Fix code and build system to build on Visual C++ (#25) #34
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This commit is based on work from RadAd (RadAd/libtsm@f879875) It also adds GitHub Actions support for Windows, changes code that relied on gcc extensions, and introduces Conan to install libcheck in a platform agnostic way.
Aetf
requested changes
Dec 22, 2023
| @@ -27,6 +27,8 @@ | |||
| #include "libtsm.h" | |||
| #include "libtsm-int.h" | |||
|
|
|||
| #define ESC "\x1b" | |||
There was a problem hiding this comment.
Why can't we directly use "\x1b"? I feel using a macro here doesn't add too much value.
Comment on lines
+47
to
+50
| #ifdef _MSC_VER | ||
| #define bzero(b,len) (memset((b), '\0', (len)), (void) 0) | ||
| #endif | ||
|
|
Comment on lines
+290
to
+298
| #ifdef _MSC_VER | ||
| struct line **cache = malloc(sizeof(struct line *) * num); | ||
| if (!cache) { | ||
| llog_warning(con, "Out of memory"); | ||
| return; | ||
| } | ||
| #else | ||
| struct line *cache[num]; | ||
| #endif |
There was a problem hiding this comment.
Using non-constant variables as array size is nonstandard anyway. Let's just use the malloc version on all platforms.
Comment on lines
+63
to
+81
| - name: Configure CMake on Unix | ||
| if: ${{ !startsWith(matrix.config.name, 'Windows') }} | ||
| working-directory: ./build | ||
| run: cmake .. -DCMAKE_BUILD_TYPE=${{ matrix.config.build_type }} -DBUILD_TESTING=On -DBUILD_GTKTSM=${{ matrix.config.gtk_tsm }} | ||
|
|
||
| - name: Configure CMake on Windows | ||
| if: startsWith(matrix.config.name, 'Windows') | ||
| working-directory: ./build | ||
| run: cmake .. -G "Visual Studio 17" -DBUILD_SHARED_LIBS=Off -DBUILD_TESTING=On -DBUILD_GTKTSM=${{ matrix.config.gtk_tsm }} | ||
|
|
||
| - name: Build on Unix | ||
| if: ${{ !startsWith(matrix.config.name, 'Windows') }} | ||
| working-directory: ./build | ||
| run: cmake --build . | ||
|
|
||
| - name: Build on Windows | ||
| if: startsWith(matrix.config.name, 'Windows') | ||
| working-directory: ./build | ||
| run: cmake --build . --config ${{ matrix.config.build_type }} |
There was a problem hiding this comment.
Almost every step is conditioned on Windows or not. IMHO it's cleaner to just create a separate Windows build job.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This commit is based on work from RadAd (RadAd/libtsm@f879875)
It also adds GitHub Actions support for Windows, changes code that relied on gcc extensions, and introduces Conan to install libcheck in a platform agnostic way.