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
3ca9ce28
Commit
3ca9ce28
authored
1 year ago
by
Hanicef
Browse files
Options
Downloads
Patches
Plain Diff
Avoid needing SDL=0 when building dedicated
parent
f2a9a817
No related branches found
No related tags found
2 merge requests
!2355
fix newer versions of mixerx
,
!2246
Add dedicated server build
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/Makefile.d/nix.mk
+4
-0
4 additions, 0 deletions
src/Makefile.d/nix.mk
src/Makefile.d/win32.mk
+4
-0
4 additions, 0 deletions
src/Makefile.d/win32.mk
with
8 additions
and
0 deletions
src/Makefile.d/nix.mk
+
4
−
0
View file @
3ca9ce28
...
@@ -14,7 +14,11 @@ opts+=-I/usr/X11R6/include
...
@@ -14,7 +14,11 @@ opts+=-I/usr/X11R6/include
libs
+=
-L
/usr/X11R6/lib
libs
+=
-L
/usr/X11R6/lib
endif
endif
ifndef
DEDICATED
ifndef
DUMMY
SDL
?=
1
SDL
?=
1
endif
endif
# In common usage.
# In common usage.
ifdef
LINUX
ifdef
LINUX
...
...
This diff is collapsed.
Click to expand it.
src/Makefile.d/win32.mk
+
4
−
0
View file @
3ca9ce28
...
@@ -17,7 +17,11 @@ sources+=win32/Srb2win.rc
...
@@ -17,7 +17,11 @@ sources+=win32/Srb2win.rc
opts
+=
-DSTDC_HEADERS
opts
+=
-DSTDC_HEADERS
libs
+=
-ladvapi32
-lkernel32
-lmsvcrt
-luser32
libs
+=
-ladvapi32
-lkernel32
-lmsvcrt
-luser32
ifndef
DEDICATED
ifndef
DUMMY
SDL
?=
1
SDL
?=
1
endif
endif
ifndef
NOHW
ifndef
NOHW
opts
+=
-DUSE_WGL_SWAP
opts
+=
-DUSE_WGL_SWAP
...
...
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