From 49823925091992ad1496a78740a12e154e8ecca6 Mon Sep 17 00:00:00 2001 From: Stefan Urbanek Date: Sat, 10 May 2003 12:01:59 +0000 Subject: [PATCH] Fixed linking under mingw32 git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/steptalk/trunk@16682 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 4 ++++ Languages/Smalltalk/ChangeLog | 8 ++++++++ Languages/Smalltalk/GNUmakefile | 1 + Languages/Smalltalk/SmalltalkEngine.m | 14 ++++---------- Source/GNUmakefile | 3 +++ 5 files changed, 20 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1d9f8ea..187e919 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2003 May 10 + + * Fixed linking under mingw32 + 2003 May 2 Stefan Urbanek * STBundleInfo: added objectReferenceDictionary; removed unnecessary ST diff --git a/Languages/Smalltalk/ChangeLog b/Languages/Smalltalk/ChangeLog index f34c004..91d62ae 100644 --- a/Languages/Smalltalk/ChangeLog +++ b/Languages/Smalltalk/ChangeLog @@ -1,3 +1,11 @@ +2003 May 9 + + * NSString+additions: added + +2003 May 4 Stefan Urbanek + + * SmalltalkEngine: remove exception guard to allow debugging + 2003 Apr 29 Stefan Urbanek * STSourceReader: fixed reading of identifiers at the end of source diff --git a/Languages/Smalltalk/GNUmakefile b/Languages/Smalltalk/GNUmakefile index d692273..e062970 100644 --- a/Languages/Smalltalk/GNUmakefile +++ b/Languages/Smalltalk/GNUmakefile @@ -30,6 +30,7 @@ Smalltalk_OBJC_FILES = \ SmalltalkEngine.m \ NSArray+additions.m \ NSNumber+additions.m \ + NSString+additions.m \ STBlock.m \ STBlockContext.m \ STBytecodeInterpreter.m \ diff --git a/Languages/Smalltalk/SmalltalkEngine.m b/Languages/Smalltalk/SmalltalkEngine.m index 985bb20..dc328f6 100644 --- a/Languages/Smalltalk/SmalltalkEngine.m +++ b/Languages/Smalltalk/SmalltalkEngine.m @@ -70,17 +70,11 @@ [compiler setEnvironment:env]; - NS_DURING - script = [compiler compileString:sourceCode]; - retval = [script executeInEnvironment:env]; - NS_HANDLER - RELEASE(compiler); - compiler = nil; - [localException raise]; - NS_ENDHANDLER - - RELEASE(compiler); + AUTORELEASE(compiler); + script = [compiler compileString:sourceCode]; + retval = [script executeInEnvironment:env]; + return retval; } @end diff --git a/Source/GNUmakefile b/Source/GNUmakefile index 45a58d7..a7a9a16 100644 --- a/Source/GNUmakefile +++ b/Source/GNUmakefile @@ -90,6 +90,9 @@ StepTalk_AGSDOC_FLAGS = \ -Declared StepTalk \ -DocumentationDirectory ../Documentation/Reference +ifeq ($(GNUSTEP_TARGET_OS),mingw32) + libStepTalk_LIBRARIES_DEPEND_UPON += -lgnustep-base -lobjc +endif -include GNUmakefile.preamble