Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-16 00:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r4219) - Add support for WITH_ICONV. It is enabled by default for OSX > 10.3 for all others set it with WITH_ICONV in Makefile.config or with --with-iconv with configure. --with-config=/somedir will search for iconv include files somewhere (or in Makefile.config with WITH_ICONV_PATH). Custom library loading is not (yet) supported

Browse Source
This commit is contained in:
Darkvater 2006-03-31 21:22:41 +00:00
parent f4b492fa1e
commit fdf4fa45ad
4 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile
View File

@ -448,10 +448,19 @@ LIBS += $(shell $(LIBPNG_CONFIG) --L_opts $(PNGCONFIG_FLAGS))
endif endif
endif endif
# iconv is enabled defaultly on OSX > 10.3
ifdef OSX ifdef OSX
ifndef JAGUAR ifndef JAGUAR
LIBS += -liconv WITH_ICONV=1
LIBS += -liconv
endif
endif endif
ifdef WITH_ICONV
CDEFS += -DWITH_ICONV
ifdef WITH_ICONV_PATH
CFLAGS += -I$(WITH_ICONV_PATH)
endif
endif endif
# enables/disables assert() # enables/disables assert()

12
configure vendored
View File

@ -31,12 +31,14 @@ function showhelp() {
echo " zlib Do you want zlib-support? [yes]" echo " zlib Do you want zlib-support? [yes]"
echo " sdl Do you want SDL-support? [yes]" echo " sdl Do you want SDL-support? [yes]"
echo " png Do you want PNG-support? [yes]" echo " png Do you want PNG-support? [yes]"
echo " iconv Do you want iconv-support? [no]"
echo " cocoa Do you want cocoa-support? (MacOSX) [no]" echo " cocoa Do you want cocoa-support? (MacOSX) [no]"
echo "" echo ""
echo "Params used to configure external libs:" echo "Params used to configure external libs:"
echo " --static-zlib-path Set the path to your static zlib []" echo " --static-zlib-path Set the path to your static zlib []"
echo " --sdl-config Where is your sdl-config [sdl-config]" echo " --sdl-config Where is your sdl-config [sdl-config]"
echo " --libpng-config Where is your libpng-config [libpng-config]" echo " --libpng-config Where is your libpng-config [libpng-config]"
echo " --with-iconv Set the path to your iconv headers []"
echo " " echo " "
} }
@ -149,6 +151,16 @@ do
--without-png) --without-png)
PARAM="$PARAM WITH_PNG=" PARAM="$PARAM WITH_PNG="
;; ;;
--with-iconv)
PARAM="$PARAM WITH_ICONV=1"
;;
--with-iconv=*)
PARAM="$PARAM WITH_ICONV=1"
handle WITH_ICONV_PATH "$n"
;;
--without-iconv)
PARAM="$PARAM WITH_ICONV="
;;
--with-cocoa) --with-cocoa)
PARAM="$PARAM WITH_COCOA=1" PARAM="$PARAM WITH_COCOA=1"
;; ;;

2
makefiledir/Makefile.config_writer
View File

@ -67,6 +67,8 @@ $(MAKE_CONFIG):
$(call CONFIG_LINE,WITH_ZLIB:=$(WITH_ZLIB)) $(call CONFIG_LINE,WITH_ZLIB:=$(WITH_ZLIB))
$(call CONFIG_LINE,WITH_SDL:=$(WITH_SDL)) $(call CONFIG_LINE,WITH_SDL:=$(WITH_SDL))
$(call CONFIG_LINE,WITH_PNG:=$(WITH_PNG)) $(call CONFIG_LINE,WITH_PNG:=$(WITH_PNG))
$(call CONFIG_LINE,WITH_ICONV:=$(WITH_ICONV))
$(call CONFIG_LINE,WITH_ICONV_PATH:=$(WITH_ICONV_PATH))
$(call CONFIG_LINE,STATIC_ZLIB_PATH:=$(STATIC_ZLIB_PATH)) $(call CONFIG_LINE,STATIC_ZLIB_PATH:=$(STATIC_ZLIB_PATH))
$(call CONFIG_LINE,WITH_COCOA:=$(WITH_COCOA)) $(call CONFIG_LINE,WITH_COCOA:=$(WITH_COCOA))
$(call CONFIG_LINE,) $(call CONFIG_LINE,)

7
unix.c
View File

@ -603,11 +603,6 @@ void CSleep(int milliseconds)
#endif // __AMIGA__ #endif // __AMIGA__
} }
// No proper makefile detection, so just force this for the time being
#if defined(__APPLE__) && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3)
# define WITH_ICONV
#endif
#ifdef WITH_ICONV #ifdef WITH_ICONV
#include <iconv.h> #include <iconv.h>
@ -621,7 +616,7 @@ void CSleep(int milliseconds)
* locale can be found, don't do any conversion "" */ * locale can be found, don't do any conversion "" */
static const char *GetLocalCode(void) static const char *GetLocalCode(void)
{ {
#if defined(__APPLE__) && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3) #if defined(__APPLE__)
return "UTF-8-MAC"; return "UTF-8-MAC";
#else #else
/* Strip locale (eg en_US.UTF-8) to only have UTF-8 */ /* Strip locale (eg en_US.UTF-8) to only have UTF-8 */