Skip to content

Mingw32 4.8.0 #23

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

Merged
merged 3 commits into from
Jan 28, 2024
Merged

Mingw32 4.8.0 #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1b92d89
Updates for SDL2 compilation
dmitrysmagin Mar 26, 2023
29a8b7a
GIT should ignore *.exe files
mywave82 Jun 27, 2023
6a8d1b0
SDL2 on windows, we need to disable some compiler and linker options
mywave82 Jun 27, 2023
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 .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,4 @@ m4/lt~obsolete.m4
src/adplay
src/config.h*
src/.libs/
*.exe
3 changes: 3 additions & 0 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,9 @@ if test ${enable_output_sdl:=yes} = yes; then
)
AC_LANG_POP(C)
fi
dnl strip away options that would turn our application from console to a windows GUI application
SDL_CFLAGS=`echo $SDL_CFLAGS |sed -e 's/-Dmain=SDL_main//g'`
SDL_LIBS=`echo $SDL_LIBS | sed -e 's/-mwindows/-mconsole/g' -e 's/-lSDLmain//g' -e 's/-lSDL2main//g'`
fi

# ALSA output
Expand Down
4 changes: 4 additions & 0 deletions src/getopt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@
extern "C" {
#endif

// in mingw, __argc and __argv are special
#undef __argc
#undef __argv

/* For communication from `getopt' to the caller.
When `getopt' finds an option that takes an argument,
the argument value is returned here.
Expand Down
2 changes: 2 additions & 0 deletions src/sdl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/

#include <stdlib.h>
#include <string.h>
#include <unistd.h>

#include "sdl_driver.h"
Expand Down
2 changes: 2 additions & 0 deletions src/sdl_driver.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
#ifndef H_SDL
#define H_SDL

#define SDL_MAIN_HANDLED 1

#include <SDL.h>

#include "output.h"
Expand Down