Mercurial > hg > dmlib

changeset 878:ac6066a31ec7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename Makefile.w32 to more logical Makefile.cross-mingw
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 04 Feb 2015 19:08:44 +0200
parents 4a2ed354ab4c
children d6b18e9a3a62
files Makefile.cross-mingw Makefile.w32
diffstat 2 files changed, 37 insertions(+), 37 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Makefile.cross-mingw	Wed Feb 04 19:08:44 2015 +0200
@@ -0,0 +1,37 @@
+#
+# For win32 version cross-compilation with MinGW suite @ Linux
+#
+DMLIB ?= ./
+BINPATH ?= ./exe/
+OBJPATH ?= ./obj/win32/
+EXEEXT ?= .exe
+
+MINGW_PREFIX ?= i686-w64-mingw32-
+MINGW_PATH ?= /usr/i686-w64-mingw32
+
+# C-compiler, flags and linker flags
+CC=$(MINGW_PREFIX)gcc
+AR=$(MINGW_PREFIX)ar
+RANLIB=$(MINGW_PREFIX)ranlib
+RM=rm
+
+SDL_CFLAGS=`$(MINGW_PATH)/bin/sdl-config --cflags`
+SDL_LDFLAGS=`$(MINGW_PATH)/bin/sdl-config --libs` -lSDL -L$(BINPATH)
+
+SDL_TTF_CFLAGS=
+SDL_TTF_LDFLAGS=-lSDL_ttf
+
+TREMOR_CFLAGS=-I$(MINGW_PATH)/include/tremor
+TREMOR_LDFLAGS=$(MINGW_PATH)/lib/libvorbisidec.a  $(MINGW_PATH)/lib/libogg.a
+
+LIBPNG_CFLAGS=-I$(MINGW_PATH)/include
+LIBPNG_LDFLAGS=$(MINGW_PATH)/lib/libpng.a
+
+ZLIB_CFLAGS=
+ZLIB_LDFLAGS=$(MINGW_PATH)/lib/libz.a
+
+#CFLAGS=-mwindows
+LDFLAGS=-lmingw32 -s
+
+
+include $(DMLIB)Makefile.gen
--- a/Makefile.w32	Wed Feb 04 19:07:16 2015 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-#
-# For win32 version cross-compilation with MinGW suite @ Linux
-#
-DMLIB ?= ./
-BINPATH ?= ./exe/
-OBJPATH ?= ./obj/win32/
-EXEEXT ?= .exe
-
-MINGW_PREFIX ?= i686-w64-mingw32-
-MINGW_PATH ?= /usr/i686-w64-mingw32
-
-# C-compiler, flags and linker flags
-CC=$(MINGW_PREFIX)gcc
-AR=$(MINGW_PREFIX)ar
-RANLIB=$(MINGW_PREFIX)ranlib
-RM=rm
-
-SDL_CFLAGS=`$(MINGW_PATH)/bin/sdl-config --cflags`
-SDL_LDFLAGS=`$(MINGW_PATH)/bin/sdl-config --libs` -lSDL -L$(BINPATH)
-
-SDL_TTF_CFLAGS=
-SDL_TTF_LDFLAGS=-lSDL_ttf
-
-TREMOR_CFLAGS=-I$(MINGW_PATH)/include/tremor
-TREMOR_LDFLAGS=$(MINGW_PATH)/lib/libvorbisidec.a  $(MINGW_PATH)/lib/libogg.a
-
-LIBPNG_CFLAGS=-I$(MINGW_PATH)/include
-LIBPNG_LDFLAGS=$(MINGW_PATH)/lib/libpng.a
-
-ZLIB_CFLAGS=
-ZLIB_LDFLAGS=$(MINGW_PATH)/lib/libz.a
-
-#CFLAGS=-mwindows
-LDFLAGS=-lmingw32 -s
-
-
-include $(DMLIB)Makefile.gen