Skip to content
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

Jump to bottom

build: SDL2 cleanups on Linux #3

Merged
merged 1 commit into from May 29, 2015
Merged

build: SDL2 cleanups on Linux #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Expand Up @@ -35,6 +35,7 @@ prince.hof
*.x86_64
*.hex
*.bat
prince

# Debug files
*.dSYM/
Expand Down
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Expand Up @@ -8,8 +8,8 @@ HFILES = common.h config.h data.h proto.h types.h
OBJ = main.o data.o seg000.o seg001.o seg002.o seg003.o seg004.o seg005.o seg006.o seg007.o seg008.o seg009.o
BIN = prince

LIBS := $(shell sdl-config --libs) -lSDL_image -lSDL_mixer
INCS := $(shell sdl-config --cflags)
LIBS := $(shell pkg-config --libs sdl2 SDL2_image SDL2_mixer)
INCS := $(shell pkg-config --cflags sdl2 SDL2_image SDL2_mixer)

CFLAGS += $(INCS) -Wall -std=gnu99

Expand Down
2 changes: 1 addition & 1 deletion doc/Readme.txt
View file
Open in desktop
Expand Up @@ -122,7 +122,7 @@ Windows:

GNU/Linux:
The libraries can be installed with apt-get or a package manager.
sudo apt-get install libsdl-image1.2-dev libsdl-mixer1.2-dev
sudo apt-get install libsdl2-image-dev libsdl2-mixer-dev
Just type the command:
make all
and the game should compile.
Expand Down