Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
RingRacers
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Lactozilla
RingRacers
Commits
57037e41
Commit
57037e41
authored
10 years ago
by
Eidolon
Browse files
Options
Downloads
Patches
Plain Diff
cmake: fixes to enable linux compilation
string.c, capitalization, find fixes
parent
68f8a5b0
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
cmake/Modules/FindSDL2.cmake
+0
-11
0 additions, 11 deletions
cmake/Modules/FindSDL2.cmake
cmake/Modules/FindSDL2_main.cmake
+1
-1
1 addition, 1 deletion
cmake/Modules/FindSDL2_main.cmake
src/sdl/CMakeLists.txt
+7
-1
7 additions, 1 deletion
src/sdl/CMakeLists.txt
with
8 additions
and
13 deletions
cmake/Modules/FindSDL2.cmake
+
0
−
11
View file @
57037e41
...
...
@@ -27,19 +27,8 @@ find_library(SDL2_LIBRARY
"/usr/local/lib"
)
find_library
(
SDL2_MAIN_LIBRARY
NAMES SDL2_main
PATHS
${
SDL2_PKGCONF_LIBRARY_DIRS
}
/usr/lib
/usr/local/lib
)
# set include dir variables
set
(
SDL2_PROCESS_INCLUDES SDL2_INCLUDE_DIR
)
set
(
SDL2_PROCESS_LIBS SDL2_LIBRARY
)
set
(
SDL2_MAIN_PROCESS_INCLUDES SDL2_INCLUDE_DIR
)
set
(
SDL2_MAIN_PROCESS_LIBS SDL2_MAIN_LIBRARY
)
libfind_process
(
SDL2
)
libfind_process
(
SDL2_MAIN
)
This diff is collapsed.
Click to expand it.
cmake/Modules/FindSDL2_main.cmake
+
1
−
1
View file @
57037e41
...
...
@@ -11,7 +11,7 @@ libfind_pkg_check_modules(SDL2_MAIN_PKGCONF SDL2)
# includes
find_path
(
SDL2_MAIN_INCLUDE_DIR
NAMES SDL
_main
.h
NAMES SDL.h
PATHS
${
SDL2_MAIN_PKGCONF_INCLUDE_DIRS
}
"/usr/include/SDL2"
...
...
This diff is collapsed.
Click to expand it.
src/sdl/CMakeLists.txt
+
7
−
1
View file @
57037e41
...
...
@@ -3,7 +3,7 @@
set
(
SRB2_CONFIG_SDL2_USEMIXER ON CACHE BOOL
"Use SDL2_mixer or regular sdl sound"
)
if
(
${
SRB2_CONFIG_SDL2_USEMIXER
}
)
find_package
(
SDL2_
MIXER
)
find_package
(
SDL2_
mixer
)
if
(
${
SDL2_MIXER_FOUND
}
)
set
(
SRB2_HAVE_MIXER ON
)
set
(
SRB2_SDL2_SOUNDIMPL mixer_sound.c
)
...
...
@@ -75,6 +75,10 @@ if(${SDL2_FOUND})
set
(
SRB2_SDL2_TOTAL_SOURCES
${
SRB2_SDL2_TOTAL_SOURCES
}
${
CMAKE_SOURCE_DIR
}
/src/win32/win_dbg.c
${
CMAKE_SOURCE_DIR
}
/src/win32/Srb2win.rc
)
endif
()
if
(
NOT CLANG
)
set
(
SRB2_SDL2_TOTAL_SOURCES
${
SRB2_SDL2_TOTAL_SOURCES
}
${
CMAKE_SOURCE_DIR
}
/src/string.c
)
endif
()
...
...
@@ -109,6 +113,8 @@ if(${SDL2_FOUND})
${
PNG_LIBRARIES
}
${
ZLIB_LIBRARIES
}
${
OPENGL_LIBRARIES
}
m
#need math lol
rt
# this too
)
endif
()
...
...
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