-
Notifications
You must be signed in to change notification settings - Fork 16
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.
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
DRAFT: msys2 working #185
base: main
Are you sure you want to change the base?
DRAFT: msys2 working #185
Conversation
@@ -1,7 +1,4 @@ | |||
#if defined(__unix__) || defined(__unix) || \ |
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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
@@ -2,6 +2,7 @@ STD_REVERB = 0 | |||
|
|||
$(MID_BUILDDIR)/%.o: $(MID_SUBDIR)/%.s | |||
@echo "$(AS) <flags> -I sound -o $@ $<" | |||
dos2unix $< |
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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");
}
}
There was a problem hiding this comment.
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.
src/platform/pret_sdl/sdl2.c
Outdated
@@ -9,7 +9,7 @@ | |||
#include <xinput.h> | |||
#endif | |||
|
|||
#include <SDL.h> | |||
#include <SDL2/SDL.h> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
SDL can be included the normal way if you make the includes use the correct directory for the flags.
Where is your SDL library located to make this work? It is using pkg-config sdl2
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I meant to set it to wip just because i knew i did this while working on it, but forgot to check the box
that will now fail to build, but i can fix that soon assuming i don't get distracted |
fixes #182 but could cause issues on other builds because of how im including sdl right now
tested using the command
make PLATFORM=sdl_win32 CPU_ARCH="i386" PREFIX=i686-w64-mingw32- CPP=cpp AS=as AR=ar -j$(nproc) OBJCOPY=objcopy
to build