Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
SRB2
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
STJr
SRB2
Commits
bbf9f5ad
Commit
bbf9f5ad
authored
8 years ago
by
Alam Ed Arias
Browse files
Options
Downloads
Patches
Plain Diff
Makefile: use built-in SDL2 and SDL2_mixer for Mingw32 and Mingw64
parent
f3d0ecbe
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/win32/Makefile.cfg
+4
-0
4 additions, 0 deletions
src/win32/Makefile.cfg
with
4 additions
and
0 deletions
src/win32/Makefile.cfg
+
4
−
0
View file @
bbf9f5ad
...
@@ -9,10 +9,14 @@
...
@@ -9,10 +9,14 @@
ifdef
MINGW64
ifdef
MINGW64
NOASM=1
NOASM=1
NONX86=1
NONX86=1
SDL_CFLAGS?=-I../libs/SDL2/x86_64-w64-mingw32/include/SDL2
-I../libs/SDL2_mixer/x86_64-w64-mingw32/include/SDL2 -Dmain=SDL_main -DSDLMAIN
SDL_LDFLAGS?=-L../libs/SDL2/x86_64-w64-mingw32/lib
-L../libs/SDL2_mixer/x86_64-w64-mingw32/lib -lmingw32 -lSDL2main -lSDL2 -mwindows -lSDL2_mixer
else
else
HAVE_LIBGME=1
HAVE_LIBGME=1
LIBGME_CFLAGS=-I../libs/gme/include
LIBGME_CFLAGS=-I../libs/gme/include
LIBGME_LDFLAGS=-L../libs/gme/win32
-lgme
LIBGME_LDFLAGS=-L../libs/gme/win32
-lgme
SDL_CFLAGS?=-I../libs/SDL2/i686-w64-mingw32/include/SDL2
-I../libs/SDL2_mixer/i686-w64-mingw32/include/SDL2 -Dmain=SDL_main -DSDLMAIN
SDL_LDFLAGS?=-L../libs/SDL2/i686-w64-mingw32/lib
-L../libs/SDL2_mixer/i686-w64-mingw32/lib -lmingw32 -lSDL2main -lSDL2 -mwindows -lSDL2_mixer
endif
endif
ifndef
NOASM
ifndef
NOASM
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment