diff options
| -rw-r--r-- | unicode/src/Makefile.in | 2 | ||||
| -rw-r--r-- | unicode/src/ultrastardx.dpr | 6 |
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} |