Skip to content

Commit

Permalink
Merge pull request #226 from fkaa/sdl2_up
Browse files Browse the repository at this point in the history
Update to SDL2
  • Loading branch information
iamgreaser committed Nov 2, 2015
2 parents 63389f4 + cae9db1 commit cd83ca5
Show file tree
Hide file tree
Showing 34 changed files with 864 additions and 1,177 deletions.
6 changes: 4 additions & 2 deletions .gitignore
Expand Up @@ -51,9 +51,11 @@ src/iceball-soft.dir
src/iceded.dir
ZERO_CHECK.dir

#some cmake generated shit that will vs.net notify of cmake file changes.
# some cmake generated shit that will vs.net notify of cmake file changes.
ALL_BUILD.vcproj
ZERO_CHECK.vcproj

#idea stuff
# idea stuff
.idea/

# clsave/vol/fastload.tmp
5 changes: 3 additions & 2 deletions CMakeLists.txt
Expand Up @@ -6,6 +6,7 @@ project (iceball)
set(CMAKE_SOURCE_DIR src)
set(OUTDIR ../build)

set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-strict-aliasing -g -Wall -Wextra -Wno-unused-variable -Wno-unused-parameter")
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")

set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
Expand Down Expand Up @@ -42,7 +43,7 @@ include_directories("${CMAKE_CURRENT_SOURCE_DIR}/xlibinc")
# find the hidden treasures
find_package(ENet REQUIRED)
find_package(PNG REQUIRED)
find_package(SDL REQUIRED)
find_package(SDL2 REQUIRED)
find_package(zlib REQUIRED)
find_package(Lua REQUIRED)
find_package(GLEW REQUIRED)
Expand All @@ -55,7 +56,7 @@ include_directories(
${SACKIT_INCLUDE_DIR}
${ZLIB_INCLUDE_DIRS}
${GLEW_INCLUDE_DIRS}
${SDL_INCLUDE_DIR}
${SDL2_INCLUDE_DIR}
${LUA_INCLUDE_DIR}
)

Expand Down
9 changes: 4 additions & 5 deletions Makefile
@@ -1,7 +1,7 @@
# I personally don't care if you steal this makefile. --GM

#-Wno-unused-but-set-variable $(CFLAGS_EXTRA)
CFLAGS = -fno-strict-aliasing -g `sdl-config --cflags` -Wall -Wextra \
CFLAGS = -fno-strict-aliasing -g -Wall -Wextra \
-Wno-unused-variable -Wno-unused-parameter \
$(CFLAGS_EXTRA) \
-Iinclude \
Expand All @@ -11,12 +11,12 @@ CFLAGS = -fno-strict-aliasing -g `sdl-config --cflags` -Wall -Wextra \
$(HEADERS_ENet) \
$(HEADERS_Lua)

HEADERS_SDL = `sdl-config --cflags`
HEADERS_SDL = `sdl2-config --cflags`
HEADERS_ENet = `pkg-config libenet --cflags`
HEADERS_Lua = `./findlua.sh --cflags`

LDFLAGS = -g -I/usr/local/include $(LDFLAGS_EXTRA)
LIBS_SDL = `sdl-config --libs`
LDFLAGS = -g -I/usr/local/include $(LDFLAGS_EXTRA)
LIBS_SDL = `sdl2-config --libs`
LIBS_ENet = `pkg-config libenet --libs`
LIBS_Lua = `./findlua.sh --libs`
# Lua is not an acronym. Get used to typing it with lower case u/a.
Expand All @@ -29,4 +29,3 @@ BINNAME = iceball
OBJDIR = build/unix_gl

include main.make

4 changes: 2 additions & 2 deletions Makefile.mingw
Expand Up @@ -14,15 +14,15 @@
CFLAGS = -O2 -fno-strict-aliasing -g -Wall -Wextra \
-Wno-unused-variable -Wno-unused-parameter \
-Wno-unused-but-set-variable \
-Iwinlibs -Iwinlibs/SDL \
-Iwinlibs -Iwinlibs/SDL2 \
-DGL_BGRA=0x80E1 \
$(CFLAGS_EXTRA) \
-I $(INCDIR)

#-msse2 -mfpmath=sse \

LDFLAGS = -g $(LDFLAGS_EXTRA)
LIBS_SDL = -lSDLmain -lSDL
LIBS_SDL = -lSDL2main -lSDL2
LIBS_ENet = -lenet -lwinmm -lws2_32
LIBS_Lua = -llua
# Lua is not an acronym. Get used to typing it with lower case u/a.
Expand Down
18 changes: 10 additions & 8 deletions Makefile.osx
@@ -1,20 +1,22 @@
# I personally don't care if you steal this makefile. --GM

CC = gcc
CFLAGS = -pg -O2 -fno-strict-aliasing -g `sdl-config --cflags` -Wall -Wextra \
CFLAGS = -fno-strict-aliasing -g -Wall -Wextra \
-Wno-unused-variable -Wno-unused-parameter \
$(CFLAGS_EXTRA) \
-DUSE_OPENGL -DAPPLE \
-I $(INCDIR) -Ixlibinc \
$(HEADERS_SDL) \
$(HEADERS_ENet) \
$(HEADERS_Lua)

# Uncomment this if you are Debian or Debian-derived
HEADERS_Lua = #-I /usr/include/lua5.1
HEADERS_SDL = `sdl2-config --cflags`
HEADERS_ENet = `pkg-config libenet --cflags`
HEADERS_Lua = `./findlua.sh --cflags`

LDFLAGS = -pg -g $(LDFLAGS_EXTRA)
LIBS_SDL = `sdl-config --libs`
LIBS_ENet = -lenet
LIBS_Lua = -llua
LDFLAGS = -g -I/usr/local/include $(LDFLAGS_EXTRA)
LIBS_SDL = `sdl2-config --libs`
LIBS_ENet = `pkg-config libenet --libs`
LIBS_Lua = `./findlua.sh --libs`
# Lua is not an acronym. Get used to typing it with lower case u/a.
LIBS_zlib = -lz
LIBS_sackit = -lsackit
Expand Down
10 changes: 5 additions & 5 deletions clsave/pub/controls.json
@@ -1,18 +1,18 @@
{
"__COMMENT_000": "

This is the sort of place you set up your controls.
It can be read by all mods, but not writeable by any.

By the way, don't store anything important in this comment.
It is possible that a hacked server might be able to read it.

READ THIS FILE: docs/setup_json.txt
READ THIS URL: http://wiki.libsdl.org/moin.cgi/SDLKeycodeLookup

For more info on the syntax itself, see http://json.org/
",

"forward": 119,
"back": 115,
"left": 97,
Expand Down
254 changes: 254 additions & 0 deletions cmake/FindSDL2.cmake
@@ -0,0 +1,254 @@
# Locate SDL2 library
# This module defines
# SDL2_LIBRARY, the name of the library to link against
# SDL2_FOUND, if false, do not try to link to SDL2
# SDL2_INCLUDE_DIR, where to find SDL.h
#
# This module responds to the the flag:
# SDL2_BUILDING_LIBRARY
# If this is defined, then no SDL2_main will be linked in because
# only applications need main().
# Otherwise, it is assumed you are building an application and this
# module will attempt to locate and set the the proper link flags
# as part of the returned SDL2_LIBRARY variable.
#
# Don't forget to include SDL2main.h and SDL2main.m your project for the
# OS X framework based version. (Other versions link to -lSDL2main which
# this module will try to find on your behalf.) Also for OS X, this
# module will automatically add the -framework Cocoa on your behalf.
#
#
# Additional Note: If you see an empty SDL2_LIBRARY_TEMP in your configuration
# and no SDL2_LIBRARY, it means CMake did not find your SDL2 library
# (SDL2.dll, libsdl2.so, SDL2.framework, etc).
# Set SDL2_LIBRARY_TEMP to point to your SDL2 library, and configure again.
# Similarly, if you see an empty SDL2MAIN_LIBRARY, you should set this value
# as appropriate. These values are used to generate the final SDL2_LIBRARY
# variable, but when these values are unset, SDL2_LIBRARY does not get created.
#
#
# $SDL2 is an environment variable that would
# correspond to the ./configure --prefix=$SDL2
# used in building SDL2.
# l.e.galup 9-20-02
#
# Modified by Eric Wing.
# Added code to assist with automated building by using environmental variables
# and providing a more controlled/consistent search behavior.
# Added new modifications to recognize OS X frameworks and
# additional Unix paths (FreeBSD, etc).
# Also corrected the header search path to follow "proper" SDL2 guidelines.
# Added a search for SDL2main which is needed by some platforms.
# Added a search for threads which is needed by some platforms.
# Added needed compile switches for MinGW.
#
# On OSX, this will prefer the Framework version (if found) over others.
# People will have to manually change the cache values of
# SDL2_LIBRARY to override this selection or set the CMake environment
# CMAKE_INCLUDE_PATH to modify the search paths.
#
# Note that the header path has changed from SDL2/SDL.h to just SDL.h
# This needed to change because "proper" SDL2 convention
# is #include "SDL.h", not <SDL2/SDL.h>. This is done for portability
# reasons because not all systems place things in SDL2/ (see FreeBSD).
#
# Ported by Johnny Patterson. This is a literal port for SDL2 of the FindSDL.cmake
# module with the minor edit of changing "SDL" to "SDL2" where necessary. This
# was not created for redistribution, and exists temporarily pending official
# SDL2 CMake modules.
#
# Note that on windows this will only search for the 32bit libraries, to search
# for 64bit change x86/i686-w64 to x64/x86_64-w64

#=============================================================================
# Copyright 2003-2009 Kitware, Inc.
#
# CMake - Cross Platform Makefile Generator
# Copyright 2000-2014 Kitware, Inc.
# Copyright 2000-2011 Insight Software Consortium
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#
# * Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
#
# * Neither the names of Kitware, Inc., the Insight Software Consortium,
# nor the names of their contributors may be used to endorse or promote
# products derived from this software without specific prior written
# permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
# This software is distributed WITHOUT ANY WARRANTY; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the License for more information.
#=============================================================================
# (To distribute this file outside of CMake, substitute the full
# License text for the above reference.)

FIND_PATH(SDL2_INCLUDE_DIR SDL.h
HINTS
${SDL2}
$ENV{SDL2}
PATH_SUFFIXES include/SDL2 include SDL2
i686-w64-mingw32/include/SDL2
x86_64-w64-mingw32/include/SDL2
PATHS
~/Library/Frameworks
/Library/Frameworks
/usr/local/include/SDL2
/usr/include/SDL2
/sw # Fink
/opt/local # DarwinPorts
/opt/csw # Blastwave
/opt
)

# Lookup the 64 bit libs on x64
IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
FIND_LIBRARY(SDL2_LIBRARY_TEMP SDL2
HINTS
${SDL2}
$ENV{SDL2}
PATH_SUFFIXES lib64 lib
lib/x64
x86_64-w64-mingw32/lib
PATHS
/sw
/opt/local
/opt/csw
/opt
)
# On 32bit build find the 32bit libs
ELSE(CMAKE_SIZEOF_VOID_P EQUAL 8)
FIND_LIBRARY(SDL2_LIBRARY_TEMP SDL2
HINTS
${SDL2}
$ENV{SDL2}
PATH_SUFFIXES lib
lib/x86
i686-w64-mingw32/lib
PATHS
/sw
/opt/local
/opt/csw
/opt
)
ENDIF(CMAKE_SIZEOF_VOID_P EQUAL 8)

IF(NOT SDL2_BUILDING_LIBRARY)
IF(NOT ${SDL2_INCLUDE_DIR} MATCHES ".framework")
# Non-OS X framework versions expect you to also dynamically link to
# SDL2main. This is mainly for Windows and OS X. Other (Unix) platforms
# seem to provide SDL2main for compatibility even though they don't
# necessarily need it.
# Lookup the 64 bit libs on x64
IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
FIND_LIBRARY(SDL2MAIN_LIBRARY
NAMES SDL2main
HINTS
${SDL2}
$ENV{SDL2}
PATH_SUFFIXES lib64 lib
lib/x64
x86_64-w64-mingw32/lib
PATHS
/sw
/opt/local
/opt/csw
/opt
)
# On 32bit build find the 32bit libs
ELSE(CMAKE_SIZEOF_VOID_P EQUAL 8)
FIND_LIBRARY(SDL2MAIN_LIBRARY
NAMES SDL2main
HINTS
${SDL2}
$ENV{SDL2}
PATH_SUFFIXES lib
lib/x86
i686-w64-mingw32/lib
PATHS
/sw
/opt/local
/opt/csw
/opt
)
ENDIF(CMAKE_SIZEOF_VOID_P EQUAL 8)
ENDIF(NOT ${SDL2_INCLUDE_DIR} MATCHES ".framework")
ENDIF(NOT SDL2_BUILDING_LIBRARY)

# SDL2 may require threads on your system.
# The Apple build may not need an explicit flag because one of the
# frameworks may already provide it.
# But for non-OSX systems, I will use the CMake Threads package.
IF(NOT APPLE)
FIND_PACKAGE(Threads)
ENDIF(NOT APPLE)

# MinGW needs an additional library, mwindows
# It's total link flags should look like -lmingw32 -lSDL2main -lSDL2 -lmwindows
# (Actually on second look, I think it only needs one of the m* libraries.)
IF(MINGW)
SET(MINGW32_LIBRARY mingw32 CACHE STRING "mwindows for MinGW")
ENDIF(MINGW)

SET(SDL2_FOUND "NO")
IF(SDL2_LIBRARY_TEMP)
# For SDL2main
IF(NOT SDL2_BUILDING_LIBRARY)
IF(SDL2MAIN_LIBRARY)
SET(SDL2_LIBRARY_TEMP ${SDL2MAIN_LIBRARY} ${SDL2_LIBRARY_TEMP})
ENDIF(SDL2MAIN_LIBRARY)
ENDIF(NOT SDL2_BUILDING_LIBRARY)

# For OS X, SDL2 uses Cocoa as a backend so it must link to Cocoa.
# CMake doesn't display the -framework Cocoa string in the UI even
# though it actually is there if I modify a pre-used variable.
# I think it has something to do with the CACHE STRING.
# So I use a temporary variable until the end so I can set the
# "real" variable in one-shot.
IF(APPLE)
SET(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} "-framework Cocoa")
ENDIF(APPLE)

# For threads, as mentioned Apple doesn't need this.
# In fact, there seems to be a problem if I used the Threads package
# and try using this line, so I'm just skipping it entirely for OS X.
IF(NOT APPLE)
SET(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} ${CMAKE_THREAD_LIBS_INIT})
ENDIF(NOT APPLE)

# For MinGW library
IF(MINGW)
SET(SDL2_LIBRARY_TEMP ${MINGW32_LIBRARY} ${SDL2_LIBRARY_TEMP})
ENDIF(MINGW)

# Set the final string here so the GUI reflects the final state.
SET(SDL2_LIBRARY ${SDL2_LIBRARY_TEMP} CACHE STRING "Where the SDL2 Library can be found")
# Set the temp variable to INTERNAL so it is not seen in the CMake GUI
SET(SDL2_LIBRARY_TEMP "${SDL2_LIBRARY_TEMP}" CACHE INTERNAL "")

SET(SDL2_FOUND "YES")
ENDIF(SDL2_LIBRARY_TEMP)

INCLUDE(FindPackageHandleStandardArgs)

FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2 REQUIRED_VARS SDL2_LIBRARY SDL2_INCLUDE_DIR)

0 comments on commit cd83ca5

Please sign in to comment.