mirror of
https://github.com/Ratstail91/Hearts.git
synced 2025-11-28 18:14:30 +11:00
Updated build for linux
This commit is contained in:
3
.gitignore
vendored
3
.gitignore
vendored
@@ -7,8 +7,11 @@
|
||||
|
||||
#Directories
|
||||
Release/
|
||||
release/
|
||||
Debug/
|
||||
debug/
|
||||
Out/
|
||||
out/
|
||||
|
||||
#Project generated files
|
||||
*.db
|
||||
|
||||
@@ -44,14 +44,14 @@ string itos(int i) {
|
||||
//-------------------------
|
||||
|
||||
HeartsEngine::HeartsEngine() {
|
||||
heartSprite.LoadSurface("rsc\\heart.bmp");
|
||||
heartSprite.LoadSurface("rsc/heart.bmp");
|
||||
heartSprite.SetClipW(64);
|
||||
|
||||
deck.Init("rsc\\cards.bmp","rsc\\back.bmp");
|
||||
deck.Init("rsc/cards.bmp","rsc/back.bmp");
|
||||
|
||||
button.LoadSurface("rsc\\button.bmp");
|
||||
button.LoadFontSurface("rsc\\pk_white_8.bmp");
|
||||
font.LoadSurface("rsc\\pk_white_8.bmp");
|
||||
button.LoadSurface("rsc/button.bmp");
|
||||
button.LoadFontSurface("rsc/pk_white_8.bmp");
|
||||
font.LoadSurface("rsc/pk_white_8.bmp");
|
||||
|
||||
button.SetX(300);
|
||||
button.SetY(300);
|
||||
|
||||
@@ -1,7 +1,15 @@
|
||||
#config
|
||||
LIB+=-lmingw32 -lSDLmain -lSDL
|
||||
CXXFLAGS+=-std=c++11 -DDEBUG
|
||||
CFLAGS+=-DDEBUG
|
||||
#libraries
|
||||
ifeq ($(OS),Windows_NT)
|
||||
LIBS+=-lmingw32
|
||||
endif
|
||||
LIBS+=-lSDLmain -lSDL
|
||||
|
||||
#flags
|
||||
CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
|
||||
ifeq ($(shell uname), Linux)
|
||||
#read data about the current install
|
||||
CXXFLAGS+=$(shell sdl-config --cflags --static-libs)
|
||||
endif
|
||||
|
||||
#source
|
||||
CXXSRC=$(wildcard *.cpp)
|
||||
@@ -18,7 +26,7 @@ OUT=$(addprefix $(OUTDIR)/,Hearts)
|
||||
|
||||
#targets
|
||||
all: $(OBJ) $(OUT)
|
||||
$(CXX) $(CXXFLAGS) -o $(OUT) $(OBJ) $(LIB)
|
||||
$(CXX) $(CXXFLAGS) -o $(OUT) $(OBJ) $(LIBS)
|
||||
|
||||
$(OBJ): | $(OBJDIR)
|
||||
|
||||
@@ -33,10 +41,13 @@ $(OUTDIR):
|
||||
$(OBJDIR)/%.o: %.cpp
|
||||
$(CXX) $(CXXFLAGS) -c -o $@ $<
|
||||
|
||||
$(OBJDIR)/%.o: %.c
|
||||
$(CC) $(CFLAGS) -c -o $@ $<
|
||||
|
||||
clean:
|
||||
ifeq ($(OS),Windows_NT)
|
||||
$(RM) *.o *.a *.exe
|
||||
else ifeq ($(shell uname), Linux)
|
||||
find . -type f -name '*.o' -exec rm -f -r -v {} \;
|
||||
find . -type f -name '*.a' -exec rm -f -r -v {} \;
|
||||
rm -f -v $(OUT)
|
||||
endif
|
||||
|
||||
rebuild: clean all
|
||||
|
||||
13
makefile
13
makefile
@@ -13,10 +13,21 @@ OUTDIR=out
|
||||
all: $(OUTDIR)
|
||||
$(MAKE) -C Hearts
|
||||
|
||||
debug: export CXXFLAGS+=-g
|
||||
debug: clean all
|
||||
|
||||
$(OUTDIR):
|
||||
mkdir $(OUTDIR)
|
||||
|
||||
clean:
|
||||
$(RM) *.o *.a *.exe
|
||||
ifeq ($(OS),Windows_NT)
|
||||
del /S /Q *.o *.a *.exe $(OUTDIR)\*
|
||||
rmdir /S /Q $(OUTDIR)
|
||||
else ifeq ($(shell uname), Linux)
|
||||
find . -type f -name '*.o' -exec rm -f -r -v {} \;
|
||||
find . -type f -name '*.a' -exec rm -f -r -v {} \;
|
||||
rm $(OUTDIR)/* -f
|
||||
find . -empty -type d -delete
|
||||
endif
|
||||
|
||||
rebuild: clean all
|
||||
|
||||
Reference in New Issue
Block a user