Move Plugins so that they link after GormCore is built since this is required on Windows, WIN32 does not support late linking

GNUmakefile

@@ -55,6 +55,7 @@ SVN_BASE_URL = svn+ssh://svn.gna.org/svn/gnustep/apps
 SUBPROJECTS = \
 	InterfaceBuilder \
 	GormCore \
+	Plugins \
 	GormObjCHeaderParser \
 	Applications \
 	Tools

GNUmakefile.postamble

@@ -0,0 +1,8 @@
+# GNUmakefile -- copy all plugins
+
+after-all::
+	echo "Copying Plugins..."
+	cp -r Plugins/GModel/*.plugin GormCore/GormCore.framework/Resources
+	cp -r Plugins/Gorm/*.plugin GormCore/GormCore.framework/Resources
+	cp -r Plugins/Nib/*.plugin GormCore/GormCore.framework/Resources
+	cp -r Plugins/Xib/*.plugin GormCore/GormCore.framework/Resources

GormCore/GNUmakefile

@@ -34,7 +34,7 @@ FRAMEWORK_NAME=GormCore
 ADDITIONAL_INCLUDE_DIRS = -I..
 srcdir = .
 
-SUBPROJECTS = Plugins
+SUBPROJECTS =
 
 GormCore_HEADER_FILES = \
 	GormCore.h \

GormCore/Plugins/Xib/GNUmakefile.preamble

@@ -1,19 +0,0 @@
-# Additional include directories the compiler should search
-ADDITIONAL_INCLUDE_DIRS += -I../../.. -I../.. -I..
-
-ifeq ($(GNUSTEP_TARGET_OS),mingw32)
-ADDITIONAL_LIB_DIRS += \
-        -L../../../GormLib/$(GNUSTEP_OBJ_DIR) \
-        -L../../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
-        -L../../../GormCore/$(GNUSTEP_OBJ_DIR)
-
-ADDITIONAL_GUI_LIBS += -lGorm -lGormCore
-endif
-ifeq ($(GNUSTEP_TARGET_OS),cygwin)
-ADDITIONAL_LIB_DIRS += \
-        -L../../../GormLib/$(GNUSTEP_OBJ_DIR) \
-        -L../../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
-        -L../../../GormCore/$(GNUSTEP_OBJ_DIR)
-
-$(BUNDLE_NAME)_LIBRARIES_DEPEND_UPON += -lGorm -lGormCore
-endif

Plugins/Xib/GNUmakefile.preamble

@@ -0,0 +1,19 @@
+# Additional include directories the compiler should search
+ADDITIONAL_INCLUDE_DIRS += -I../../.. -I../.. -I.. -I../GormCore
+
+ifeq ($(GNUSTEP_TARGET_OS),mingw32)
+ADDITIONAL_LIB_DIRS += \
+        -L../../../InterfaceBuilder/InterfaceBuilder.framework \
+        -L../../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
+        -L../../../GormCore/GormCore.framework \
+
+ADDITIONAL_GUI_LIBS += -lInterfaceBuilder -lGormCore
+endif
+ifeq ($(GNUSTEP_TARGET_OS),cygwin)
+ADDITIONAL_LIB_DIRS += \
+        -L../../../InterfaceBuilder/InterfaceBuilder.framework \
+        -L../../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
+        -L../../../GormCore/GormCore.framework \
+
+$(BUNDLE_NAME)_LIBRARIES_DEPEND_UPON += -lInterfaceBuilder -lGormCore
+endif

Plugins/Xib/GormXIBModelGenerator.m

@@ -47,11 +47,11 @@
 
 #import <GNUstepBase/GSObjCRuntime.h>
 
-#import "GormDocument.h"
-#import "GormDocumentController.h"
-#import "GormFilePrefsManager.h"
-#import "GormProtocol.h"
-#import "GormPrivate.h"
+#import <GormCore/GormDocument.h>
+#import <GormCore/GormDocumentController.h>
+#import <GormCore/GormFilePrefsManager.h>
+#import <GormCore/GormProtocol.h>
+#import <GormCore/GormPrivate.h>
 
 #import "GormXIBModelGenerator.h"
 

Tools/gormtool/main.m

@@ -35,6 +35,8 @@
 
 int main(int argc, char **argv)
 {
+  NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+  
   NSApplication *app = [NSApplication sharedApplication];
   AppDelegate *delegate = [[AppDelegate alloc] init];
   extern char **environ;
@@ -51,5 +53,7 @@ int main(int argc, char **argv)
   [app setDelegate: delegate];
   [app run];
 
+  RELEASE(pool);
+  
   return 0;
 }