aboutsummaryrefslogtreecommitdiffstats
path: root/unicode
diff options
context:
space:
mode:
authortobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>2009-07-23 18:25:29 +0000
committertobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>2009-07-23 18:25:29 +0000
commit4c32c09178bc432fe03550fcb6c392d7051b3b74 (patch)
treed02569b17a8a4a4c74d896551ef5608d6128e20a /unicode
parent91f5146180d33a6d197c3d005503c4e253dbb9d6 (diff)
downloadusdx-4c32c09178bc432fe03550fcb6c392d7051b3b74.tar.gz
usdx-4c32c09178bc432fe03550fcb6c392d7051b3b74.tar.xz
usdx-4c32c09178bc432fe03550fcb6c392d7051b3b74.zip
- iconv ambiguity on mac os x solved (used /sw/lib/ one with missing symbols instead of /usr/lib one)
- cwstring unit enabled again. Was previously disabled because of a crash caused by using WideUpperCase() from an SDL-thread (here from an SDLTimer callback). The bug was fixed several months ago. In addition it works now on OS X as of the fix described above. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@1877 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'unicode')
-rw-r--r--unicode/src/Makefile.in2
-rw-r--r--unicode/src/ultrastardx.dpr6
2 files changed, 2 insertions, 6 deletions
diff --git a/unicode/src/Makefile.in b/unicode/src/Makefile.in
index 3d4b6def..06e62c43 100644
--- a/unicode/src/Makefile.in
+++ b/unicode/src/Makefile.in
@@ -122,7 +122,7 @@ endif
LIBS ?= @LIBS@
LDFLAGS ?= @LDFLAGS@
-linkflags := $(sort $(LDFLAGS) $(LIBS))
+linkflags := -L/usr/lib $(sort $(LDFLAGS) $(LIBS))
ifneq ($(linkflags),)
PLINKFLAGS := -k"$(linkflags)"
endif
diff --git a/unicode/src/ultrastardx.dpr b/unicode/src/ultrastardx.dpr
index 9a5bc118..21e1b15f 100644
--- a/unicode/src/ultrastardx.dpr
+++ b/unicode/src/ultrastardx.dpr
@@ -50,11 +50,7 @@ uses
{$IFDEF Unix}
cthreads, // THIS MUST be the first used unit in FPC if Threads are used!!
// (see http://wiki.lazarus.freepascal.org/Multithreaded_Application_Tutorial)
- // cwstring crashes in FPC 2.2.2 so do not use the cwstring stuff
- {.$IFNDEF DARWIN}
- {$IFDEF NOIGNORE}
- cwstring, // Enable Unicode support. MacOSX misses some references to iconv.
- {$ENDIF}
+ cwstring, // Enable Unicode support
{$ENDIF}
{$IFNDEF FPC}