Updated build for linux

This commit is contained in:
2015-11-23 23:40:15 +11:00
parent 27996d9511
commit 82d918e4d5
4 changed files with 39 additions and 14 deletions

3
.gitignore vendored
View File

@@ -7,8 +7,11 @@
#Directories #Directories
Release/ Release/
release/
Debug/ Debug/
debug/
Out/ Out/
out/
#Project generated files #Project generated files
*.db *.db

View File

@@ -44,14 +44,14 @@ string itos(int i) {
//------------------------- //-------------------------
HeartsEngine::HeartsEngine() { HeartsEngine::HeartsEngine() {
heartSprite.LoadSurface("rsc\\heart.bmp"); heartSprite.LoadSurface("rsc/heart.bmp");
heartSprite.SetClipW(64); 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.LoadSurface("rsc/button.bmp");
button.LoadFontSurface("rsc\\pk_white_8.bmp"); button.LoadFontSurface("rsc/pk_white_8.bmp");
font.LoadSurface("rsc\\pk_white_8.bmp"); font.LoadSurface("rsc/pk_white_8.bmp");
button.SetX(300); button.SetX(300);
button.SetY(300); button.SetY(300);

View File

@@ -1,7 +1,15 @@
#config #libraries
LIB+=-lmingw32 -lSDLmain -lSDL ifeq ($(OS),Windows_NT)
CXXFLAGS+=-std=c++11 -DDEBUG LIBS+=-lmingw32
CFLAGS+=-DDEBUG 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 #source
CXXSRC=$(wildcard *.cpp) CXXSRC=$(wildcard *.cpp)
@@ -18,7 +26,7 @@ OUT=$(addprefix $(OUTDIR)/,Hearts)
#targets #targets
all: $(OBJ) $(OUT) all: $(OBJ) $(OUT)
$(CXX) $(CXXFLAGS) -o $(OUT) $(OBJ) $(LIB) $(CXX) $(CXXFLAGS) -o $(OUT) $(OBJ) $(LIBS)
$(OBJ): | $(OBJDIR) $(OBJ): | $(OBJDIR)
@@ -33,10 +41,13 @@ $(OUTDIR):
$(OBJDIR)/%.o: %.cpp $(OBJDIR)/%.o: %.cpp
$(CXX) $(CXXFLAGS) -c -o $@ $< $(CXX) $(CXXFLAGS) -c -o $@ $<
$(OBJDIR)/%.o: %.c
$(CC) $(CFLAGS) -c -o $@ $<
clean: clean:
ifeq ($(OS),Windows_NT)
$(RM) *.o *.a *.exe $(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 rebuild: clean all

View File

@@ -13,10 +13,21 @@ OUTDIR=out
all: $(OUTDIR) all: $(OUTDIR)
$(MAKE) -C Hearts $(MAKE) -C Hearts
debug: export CXXFLAGS+=-g
debug: clean all
$(OUTDIR): $(OUTDIR):
mkdir $(OUTDIR) mkdir $(OUTDIR)
clean: 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 rebuild: clean all