# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1349321812 -10800
# Node ID f5c5af85ccfd171f04b1937a2ab430104398e417
# Parent  40b1afc3b7d823544438bcd23d52890f86a3591b
Update Makefiles.

diff -r 40b1afc3b7d8 -r f5c5af85ccfd Makefile
--- 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
diff -r 40b1afc3b7d8 -r f5c5af85ccfd Makefile.w32
--- 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
diff -r 40b1afc3b7d8 -r f5c5af85ccfd Makefile.w64
--- 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
diff -r 40b1afc3b7d8 -r f5c5af85ccfd exe/.dummy