From 6c6c434f6cc79aa3b9f01d8d5d7b2d538ee68942 Mon Sep 17 00:00:00 2001 From: pixel Date: Wed, 1 Feb 2006 20:40:08 +0000 Subject: Updating win32's makefiles. --- compile/win32/Makefile | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/compile/win32/Makefile b/compile/win32/Makefile index 5efd4a1..50e3349 100644 --- a/compile/win32/Makefile +++ b/compile/win32/Makefile @@ -16,16 +16,16 @@ INCLUDES = \ -I../../generic/lib/zlib/include \ -I../../generic/lib/lua/include -I../../generic/lib/lua/includes \ -I../../mogltk/include \ --I../../MSVC/regex -I../../MSVC/readline -I../../MSVC/getopt -I../../MSVC \ +-I../../MSVC/regex -I../../MSVC/readline -I../../MSVC/getopt -I../../MSVC/iconv -I../../MSVC \ -I../.. -CPPFLAGS = $(INCLUDES) -march=i686 -DSTDC_HEADERS -DREADLINE_STATIC -fexceptions +CPPFLAGS = $(INCLUDES) -march=i686 -DSTDC_HEADERS -DREADLINE_STATIC -DLIBICONV_PLUG -DNO_HFILE -fexceptions LDFLAGS = -O4 `sdl-config --libs` -vpath %.c ../../Dalos:../../:../../mogltk/lib:../../generic/lib:../../lib:../../psxdev:../../generic/lib/zlib/src:../../generic/lib/lua/src:../../generic/lib/lua/src/LuaLib:../../MSVC/regex:../../MSVC/getopt -vpath %.cc ../../Dalos:../../:../../mogltk/lib:../../generic/lib:../../lib:../../psxdev:../../generic/lib/zlib/src:../../generic/lib/lua/src:../../generic/lib/lua/src/LuaLib:../../MSVC/regex:../../MSVC/getopt -vpath %.cpp ../../Dalos:../../:../../mogltk/lib:../../generic/lib:../../lib:../../psxdev:../../generic/lib/zlib/src:../../generic/lib/lua/src:../../generic/lib/lua/src/LuaLib:../../MSVC/regex:../../MSVC/getopt +vpath %.c ../../Dalos:../../:../../mogltk/lib:../../generic/lib:../../lib:../../psxdev:../../generic/lib/zlib/src:../../generic/lib/lua/src:../../generic/lib/lua/src/LuaLib:../../MSVC/regex:../../MSVC/getopt:../../MSVC/iconv +vpath %.cc ../../Dalos:../../:../../mogltk/lib:../../generic/lib:../../lib:../../psxdev:../../generic/lib/zlib/src:../../generic/lib/lua/src:../../generic/lib/lua/src/LuaLib:../../MSVC/regex:../../MSVC/getopt:../../MSVC/iconv +vpath %.cpp ../../Dalos:../../:../../mogltk/lib:../../generic/lib:../../lib:../../psxdev:../../generic/lib/zlib/src:../../generic/lib/lua/src:../../generic/lib/lua/src/LuaLib:../../MSVC/regex:../../MSVC/getopt:../../MSVC/iconv SOURCES = \ cd-tool.cpp @@ -102,11 +102,13 @@ REGEX_SOURCES = msvc-regex.c GETOPT_SOURCES = getopt.c getopt1.c +ICONV_SOURCES = iconv.c localcharset.c relocatable.c + COMMON_SOURCES = \ $(BALTISOT_SOURCES) $(ZLIB_SOURCES) $(REGEX_SOURCES) $(GETOPT_SOURCES) \ $(LUA_SOURCES) $(PSX_SOURCES) $(PSXDEV_SOURCES) $(READLINE_SOURCES) \ -$(HASH_SOURCES) +$(HASH_SOURCES) $(ICONV_SOURCES) WHOLE_SOURCES = $(SOURCES) $(COMMON_SOURCES) $(MOGLTK_SOURCES) -- cgit v1.2.3