gnustep/apps-gorm
0
0
Fork 0
mirror of https://github.com/gnustep/apps-gorm.git synced 2025-02-23 11:41:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix build issue

Browse source
This commit is contained in:
Gregory John Casamento 2023-06-12 02:05:53 -04:00
parent 5d374cb520
commit 59775174d7
8 changed files with 51 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
GNUmakefile
View file

@ -61,7 +61,6 @@ SUBPROJECTS = \
GormCore \
GormPrefs \
Palettes \
Plugins \
Tools
#

6
GormCore/GNUmakefile
View file

@ -170,7 +170,11 @@ GormCore_OBJC_FILES = \
NSView+GormExtensions.m \
GormPrivate.m
GormCore_RESOURCE_FILES =
GormCore_RESOURCE_FILES = \
Plugins/Gorm/Gorm.plugin \
Plugins/Nib/Nib.plugin \
Plugins/Xib/Xib.plugin \
Plugins/GModel/GModel.plugin
-include GNUmakefile.preamble
-include GNUmakefile.local

18
GormCore/Plugins/GModel/GNUmakefile.preamble
View file

@ -1,21 +1,21 @@
# Additional include directories the compiler should search
ADDITIONAL_INCLUDE_DIRS += -I../..
ADDITIONAL_INCLUDE_DIRS += -I../../..
ifeq ($(GNUSTEP_TARGET_OS),mingw32)
ADDITIONAL_LIB_DIRS += \
-L../../GormLib/$(GNUSTEP_OBJ_DIR) \
-L../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
-L../../GormPrefs/$(GNUSTEP_OBJ_DIR) \
-L../../GormCore/$(GNUSTEP_OBJ_DIR)
-L../../../GormLib/$(GNUSTEP_OBJ_DIR) \
-L../../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
-L../../../GormPrefs/$(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../../GormPrefs/$(GNUSTEP_OBJ_DIR) \
-L../../GormCore/$(GNUSTEP_OBJ_DIR)
-L../../../GormLib/$(GNUSTEP_OBJ_DIR) \
-L../../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
-L../../../GormPrefs/$(GNUSTEP_OBJ_DIR) \
-L../../../GormCore/$(GNUSTEP_OBJ_DIR)
GModel_LIBRARIES_DEPEND_UPON += -lGorm -lGormCore
endif

16
GormCore/Plugins/GNUmakefile.preamble
View file

@ -1,9 +1,8 @@
# GNUmakefile: main makefile for GNUstep Object Relationship Modeller
#
# Copyright (C) 2003 Free Software Foundation, Inc.
#
# Author: Gregory John Casamento <greg_casamento@yahoo.com>
# Date: 2003
# Author: Gregory John Casamento <greg,casamento@gmail.com>
# Date: 2023
#
# This file is part of GNUstep.
#
@ -23,16 +22,9 @@
# USA.
#
#ADDITIONAL_TOOL_LIBS += \
# -lGormCore \
# -lGorm \
# -lGormObjCHeaderParser \
# -lGormPrefs \
# -lgnustep-base \
# -lgnustep-gui
ADDITIONAL_INCLUDE_DIRS += \
-I../../
-I../../ \
-I../
ADDITIONAL_LIB_DIRS += \
-L../../GormLib/$(GNUSTEP_OBJ_DIR) \

18
GormCore/Plugins/Gorm/GNUmakefile.preamble
View file

@ -1,21 +1,21 @@
# Additional include directories the compiler should search
ADDITIONAL_INCLUDE_DIRS += -I../..
ADDITIONAL_INCLUDE_DIRS += -I../../..
ifeq ($(GNUSTEP_TARGET_OS),mingw32)
ADDITIONAL_LIB_DIRS += \
-L../../GormLib/$(GNUSTEP_OBJ_DIR) \
-L../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
-L../../GormPrefs/$(GNUSTEP_OBJ_DIR) \
-L../../GormCore/$(GNUSTEP_OBJ_DIR)
-L../../../GormLib/$(GNUSTEP_OBJ_DIR) \
-L../../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
-L../../../GormPrefs/$(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../../GormPrefs/$(GNUSTEP_OBJ_DIR) \
-L../../GormCore/$(GNUSTEP_OBJ_DIR)
-L../../../GormLib/$(GNUSTEP_OBJ_DIR) \
-L../../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
-L../../../GormPrefs/$(GNUSTEP_OBJ_DIR) \
-L../../../GormCore/$(GNUSTEP_OBJ_DIR)
Gorm_LIBRARIES_DEPEND_UPON += -lGorm -lGormCore
endif

18
GormCore/Plugins/Nib/GNUmakefile.preamble
View file

@ -1,21 +1,21 @@
# Additional include directories the compiler should search
ADDITIONAL_INCLUDE_DIRS += -I../..
ADDITIONAL_INCLUDE_DIRS += -I../../..
ifeq ($(GNUSTEP_TARGET_OS),mingw32)
ADDITIONAL_LIB_DIRS += \
-L../../GormLib/$(GNUSTEP_OBJ_DIR) \
-L../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
-L../../GormPrefs/$(GNUSTEP_OBJ_DIR) \
-L../../GormCore/$(GNUSTEP_OBJ_DIR)
-L../../../GormLib/$(GNUSTEP_OBJ_DIR) \
-L../../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
-L../../../GormPrefs/$(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../../GormPrefs/$(GNUSTEP_OBJ_DIR) \
-L../../GormCore/$(GNUSTEP_OBJ_DIR)
-L../../../GormLib/$(GNUSTEP_OBJ_DIR) \
-L../../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
-L../../../GormPrefs/$(GNUSTEP_OBJ_DIR) \
-L../../../GormCore/$(GNUSTEP_OBJ_DIR)
Nib_LIBRARIES_DEPEND_UPON += -lGorm -lGormCore
endif

18
GormCore/Plugins/Xib/GNUmakefile.preamble
View file

@ -1,21 +1,21 @@
# Additional include directories the compiler should search
ADDITIONAL_INCLUDE_DIRS += -I../..
ADDITIONAL_INCLUDE_DIRS += -I../../..
ifeq ($(GNUSTEP_TARGET_OS),mingw32)
ADDITIONAL_LIB_DIRS += \
-L../../GormLib/$(GNUSTEP_OBJ_DIR) \
-L../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
-L../../GormPrefs/$(GNUSTEP_OBJ_DIR) \
-L../../GormCore/$(GNUSTEP_OBJ_DIR)
-L../../../GormLib/$(GNUSTEP_OBJ_DIR) \
-L../../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
-L../../../GormPrefs/$(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../../GormPrefs/$(GNUSTEP_OBJ_DIR) \
-L../../GormCore/$(GNUSTEP_OBJ_DIR)
-L../../../GormLib/$(GNUSTEP_OBJ_DIR) \
-L../../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
-L../../../GormPrefs/$(GNUSTEP_OBJ_DIR) \
-L../../../GormCore/$(GNUSTEP_OBJ_DIR)
Nib_LIBRARIES_DEPEND_UPON += -lGorm -lGormCore
endif

7
Tools/gormtool/AppDelegate.m
View file

@ -35,7 +35,7 @@
- (void) applicationDidFinishLaunching: (NSNotification *)n
{
NSLog(@"== gormtool");
puts("== gormtool");
NSLog(@"processInfo: %@", [NSProcessInfo processInfo]);
[self process];
@ -43,4 +43,9 @@
[NSApp terminate: nil];
}
- (void) applicationWillTerminate: (NSNotification *)n
{
puts("== finished...");
}
@end