Skip to content

DRAFT: msys2 working #185

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bitten2up wants to merge 6 commits into
base: main
Choose a base branch
from
Open

DRAFT: msys2 working #185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
80ff34f
msys2 working
bitten2up Jan 14, 2025
d1852a0
Merge branch 'main' into msys2
bitten2up Jan 14, 2025
9103de7
sdl
bitten2up Jan 15, 2025
8c7a4fd
Merge branch 'msys2' of https://github.com/bitten2up/sa2 into msys2
bitten2up Jan 15, 2025
4262075
Merge branch 'main' into msys2
bitten2up Jan 15, 2025
225b98c
Merge branch 'main' into msys2
bitten2up Jan 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions songs.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ STD_REVERB = 0

$(MID_BUILDDIR)/%.o: $(MID_SUBDIR)/%.s
@echo "$(AS) <flags> -I sound -o $@ $<"
dos2unix $<
Copy link
Collaborator

@freshollie freshollie Jan 14, 2025

Choose a reason for hiding this comment

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

Lol, so yeah this needs to be set if you are on windows?

Copy link
Contributor Author

@bitten2up bitten2up Jan 15, 2025

Choose a reason for hiding this comment

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

yep,
from tools/preproc/asm_file.cpp

i tried updating it but it randomly segfaults so this is the solution im using to work around that

// Asserts that the rest of the line is empty and moves to the next one.
void AsmFile::ExpectEmptyRestOfLine()
{
    SkipWhitespace();

    if (m_buffer[m_pos] == 0)
    {
        if (m_pos >= m_size)
            RaiseWarning("file doesn't end with newline");
        else
            RaiseError("unexpected null character");
    }
    else if (m_buffer[m_pos] == '\n')
    {
        m_pos++;
        m_lineStart = m_pos;
        m_lineNum++;
    }
    else if (m_buffer[m_pos] == '\r')
    {
        RaiseError("only Unix-style LF newlines are supported");
    }
    else
    {
        RaiseError("junk at end of line");
    }
}

Copy link
Collaborator

@JaceCear JaceCear Jan 15, 2025

Choose a reason for hiding this comment

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

I don't like the workaround at all.
Either the code gets proper CRLF support or not, but dos2unix is an additional dependency that we don't need.

@$(PREPROC) $< "" | $(CPP) $(CPPFLAGS) - | $(AS) $(ASFLAGS) -o $@ -

$(MID_SUBDIR)/mus_intro.s: %.s: %.mid
Expand Down
8 changes: 4 additions & 4 deletions tools/_shared/arena_alloc/ArenaAlloc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ static void memArenaExpand(MemArena *arena, s32 numNewArenas);
// if you directly pass a value that is 2GB or more (0x80000000),
// you'll be left with a downcast signed 32 bit value, even in 64bit mode
// Behaviour in: VS Compiler v14.34.31937.0
u64 GetGigabytes(u64 num) {
return num*1024*1024*1024;
u64 GetMegabytes(u64 num) {
return num*1024*1024;
}

static void *memArenaVirtualAlloc(void* baseAddress, size_t size) {
Expand All @@ -51,11 +51,11 @@ static void *memArenaVirtualAlloc(void* baseAddress, size_t size) {
}
#elif (defined _MSC_VER)
// TODO/TEMP: Just reserve 2GB for each arena
u64 memoryAmount = GetGigabytes(1);
u64 memoryAmount = GetMegabytes(1);
memory = VirtualAlloc(baseAddress, memoryAmount, (MEM_COMMIT | MEM_RESERVE), PAGE_READWRITE);
#else
// TODO/TEMP: Just reserve 2GB for each arena
u64 memoryAmount = GetGigabytes(1);
u64 memoryAmount = GetMegabytes(1);
printf("WARNING: OS-specific SDK not found. Using malloc.\n");
memory = malloc(memoryAmount);

Expand Down
5 changes: 1 addition & 4 deletions tools/entity_positions/epos.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
#if defined(__unix__) || defined(__unix) || \
Copy link
Collaborator

@freshollie freshollie Jan 14, 2025

Choose a reason for hiding this comment

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

I guess this can be removed, but what was the reason for it @JaceCear?

Copy link
Contributor Author

@bitten2up bitten2up Jan 15, 2025

Choose a reason for hiding this comment

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

i would assume msvc

there is defines checking for it, but i would assume we arent compiling the tools in visual studio anyways

Copy link
Collaborator

@JaceCear JaceCear Jan 15, 2025

Choose a reason for hiding this comment

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

Looks like BriBaSA doesn't like it if it's not there?
1d0c7df

IMO keeping VS compat in turn means theoretical (and in this case practical) independence from GCC, which is a good thing.
I do prefer building with Visual Studio because it outputs proper PDBs, unlike the tool I use to convert GCC's debug info output.

Copy link
Contributor Author

@bitten2up bitten2up Jan 15, 2025

Choose a reason for hiding this comment

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

Looks like BriBaSA doesn't like it if it's not there? 1d0c7df

IMO keeping VS compat in turn means theoretical (and in this case practical) independence from GCC, which is a good thing. I do prefer building with Visual Studio because it outputs proper PDBs, unlike the tool I use to convert GCC's debug info output.

ok would !MSVC be a better choice then

(defined(__APPLE__) && defined(__MACH__))
#include <assert.h>
#endif

#include <stdbool.h>
#include <stdio.h>
Expand Down Expand Up @@ -117,4 +114,4 @@ int main(int argc, char **argv)
}

return 0;
}
}
Loading