Mercurial > hg > demos > krapula
changeset 34:f5c5af85ccfd
Update Makefiles.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Thu, 04 Oct 2012 06:36:52 +0300 |
parents | 40b1afc3b7d8 |
children | 1bac8390dafc |
files | Makefile Makefile.w32 Makefile.w64 exe/.dummy |
diffstat | 3 files changed, 12 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Thu Oct 04 06:30:36 2012 +0300 +++ b/Makefile Thu Oct 04 06:36:52 2012 +0300 @@ -8,7 +8,7 @@ DMLIB = ./dmlib/ BINPATH ?= ./ -OBJPATH ?= ./unix/ +OBJPATH ?= ./obj/unix/ EXEEXT ?= .bin BINARIES=krapula
--- a/Makefile.w32 Thu Oct 04 06:30:36 2012 +0300 +++ b/Makefile.w32 Thu Oct 04 06:36:52 2012 +0300 @@ -6,7 +6,7 @@ DMLIB = ./dmlib/ BINPATH ?= ./ -OBJPATH ?= ./win32/ +OBJPATH ?= ./obj/win32/ EXEEXT ?= .exe # C-compiler, flags and linker flags
--- a/Makefile.w64 Thu Oct 04 06:30:36 2012 +0300 +++ b/Makefile.w64 Thu Oct 04 06:36:52 2012 +0300 @@ -1,12 +1,14 @@ # -# For win32 version cross-compilation with MinGW suite @ Linux +# For win64 version cross-compilation with MinGW suite @ Linux # MINGW_PREFIX=x86_64-w64-mingw32- MINGW_PATH=/usr/x86_64-w64-mingw32 -BINPATH=./exe/ -OBJPATH=./win64/ -EXEEXT=-w64.exe +DMLIB = ./dmlib/ +BINPATH ?= ./exe/ +OBJPATH ?= ./win64/ +OBJPATH ?= ./obj/win32/ +EXEEXT ?= -w64.exe # C-compiler, flags and linker flags CC=$(MINGW_PREFIX)gcc @@ -16,9 +18,12 @@ SDL_CFLAGS=`$(MINGW_PATH)/bin/sdl-config --cflags` SDL_LDFLAGS=`$(MINGW_PATH)/bin/sdl-config --libs` -lSDL -L$(BINPATH) +TREMOR_CFLAGS=-I$(MINGW_PATH)/include/tremor +TREMOR_LDFLAGS=$(MINGW_PATH)/lib/libvorbisidec.a $(MINGW_PATH)/lib/libogg.a #CFLAGS=-mwindows LDFLAGS=-lmingw32 -s +BINARIES=krapula -include Makefile.gen +include $(DMLIB)Makefile.gen