Fix SDL paths for guix build
This commit is contained in:
parent
a5644cff6d
commit
53ce115392
2
Makefile
2
Makefile
|
@ -18,7 +18,7 @@
|
||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with Meritous. If not, see <http://www.gnu.org/licenses/>.
|
# along with Meritous. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#
|
#
|
||||||
LDFLAGS = `sdl-config --libs` -lSDL_image -lSDL_mixer -lz
|
LDFLAGS = `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lpthread -lm
|
||||||
CCFLAGS = -O2 -Wall `sdl-config --cflags` -g
|
CCFLAGS = -O2 -Wall `sdl-config --cflags` -g
|
||||||
#
|
#
|
||||||
OBJS = src/levelblit.o \
|
OBJS = src/levelblit.o \
|
||||||
|
|
|
@ -23,8 +23,8 @@
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include <SDL.h>
|
#include <SDL.h>
|
||||||
#include <SDL_image.h>
|
#include <SDL/SDL_image.h>
|
||||||
#include <SDL_mixer.h>
|
#include <SDL/SDL_mixer.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include "levelblit.h"
|
#include "levelblit.h"
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
#include <SDL.h>
|
#include <SDL.h>
|
||||||
#include <SDL_image.h>
|
#include <SDL/SDL_image.h>
|
||||||
|
|
||||||
#include "levelblit.h"
|
#include "levelblit.h"
|
||||||
#include "mapgen.h"
|
#include "mapgen.h"
|
||||||
|
|
|
@ -22,8 +22,8 @@
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include <SDL.h>
|
#include <SDL/SDL.h>
|
||||||
#include <SDL_image.h>
|
#include <SDL/SDL_image.h>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
|
||||||
#include "levelblit.h"
|
#include "levelblit.h"
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include <SDL.h>
|
#include <SDL.h>
|
||||||
#include <SDL_image.h>
|
#include <SDL/SDL_image.h>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
|
||||||
#include "levelblit.h"
|
#include "levelblit.h"
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include <SDL.h>
|
#include <SDL.h>
|
||||||
#include <SDL_image.h>
|
#include <SDL/SDL_image.h>
|
||||||
|
|
||||||
#include "levelblit.h"
|
#include "levelblit.h"
|
||||||
#include "mapgen.h"
|
#include "mapgen.h"
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include <SDL.h>
|
#include <SDL.h>
|
||||||
#include <SDL_image.h>
|
#include <SDL/SDL_image.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include "levelblit.h"
|
#include "levelblit.h"
|
||||||
|
|
|
@ -24,8 +24,8 @@
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
#include <SDL.h>
|
#include <SDL/SDL.h>
|
||||||
#include <SDL_image.h>
|
#include <SDL/SDL_image.h>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
|
||||||
#include "mapgen.h"
|
#include "mapgen.h"
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include <SDL.h>
|
#include <SDL.h>
|
||||||
#include <SDL_image.h>
|
#include <SDL/SDL_image.h>
|
||||||
#include <zlib.h>
|
#include <zlib.h>
|
||||||
|
|
||||||
#include "levelblit.h"
|
#include "levelblit.h"
|
||||||
|
|
Reference in New Issue