gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-31 20:40:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix static linking

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@11167 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fedor 2001-10-17 03:53:55 +00:00
parent 1b2f8dae39
commit cfb13cc185
6 changed files with 40 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
ChangeLog
View file

@ -1,3 +1,17 @@
2001-10-16 Adam Fedor <fedor@gnu.org>
* GNUmakefile.postamble (before-install): Remove extra /
* TextConverters/RTF/GNUmakefile: Add BUNDLE_LIBS on mingw32/cygwin
(bug report from stephen@brandonitconsulting.co.uk).
* Source/NSMenuItemCell.m (calcSize): Check that images exist
before asking for their size (assigning structs from nil objects
crashes Solaris).
* Make sure classes are linked in when shared=no
* Source/linking.m: New file.
* Source/extern.m (__objc_gui_force_linking): Linking function.
2001-10-16 Pierre-Yves Rivaille <pyrivail@ens-lyon.fr> 2001-10-16 Pierre-Yves Rivaille <pyrivail@ens-lyon.fr>
* Source/NSTableView.m ([selectColumn:byExtendingSelection]): * Source/NSTableView.m ([selectColumn:byExtendingSelection]):

2
GNUmakefile.postamble
View file

@ -51,7 +51,7 @@ $(INSTALL_ROOT_DIR)$(GNUSTEP_MAKEFILES)/Additional:
# Things to do before installing # Things to do before installing
before-install:: $(INSTALL_ROOT_DIR)$(GNUSTEP_MAKEFILES)/Additional before-install:: $(INSTALL_ROOT_DIR)$(GNUSTEP_MAKEFILES)/Additional
$(INSTALL_DATA) gui.make \ $(INSTALL_DATA) gui.make \
$(INSTALL_ROOT_DIR)/$(GNUSTEP_MAKEFILES)/Additional/gui.make $(INSTALL_ROOT_DIR)$(GNUSTEP_MAKEFILES)/Additional/gui.make
# Things to do after installing # Things to do after installing
# after-install:: # after-install::

1
Source/GNUmakefile
View file

@ -152,6 +152,7 @@ GSTrackingRect.m \
GSServicesManager.m \ GSServicesManager.m \
tiff.m \ tiff.m \
externs.m \ externs.m \
linking.m \
GSFontInfo.m \ GSFontInfo.m \
GSTable.m \ GSTable.m \
GSHbox.m \ GSHbox.m \

9
Source/NSMenuItemCell.m
View file

@ -129,20 +129,23 @@ static NSImage *arrowImageH = nil;
if ([_menuItem changesState]) if ([_menuItem changesState])
{ {
// NSOnState // NSOnState
componentSize = [[_menuItem onStateImage] size]; if ([_menuItem onStateImage])
componentSize = [[_menuItem onStateImage] size];
_stateImageWidth = componentSize.width; _stateImageWidth = componentSize.width;
if (componentSize.height > neededMenuItemHeight) if (componentSize.height > neededMenuItemHeight)
neededMenuItemHeight = componentSize.height; neededMenuItemHeight = componentSize.height;
// NSOffState // NSOffState
componentSize = [[_menuItem offStateImage] size]; if ([_menuItem offStateImage])
componentSize = [[_menuItem offStateImage] size];
if (componentSize.width > _stateImageWidth) if (componentSize.width > _stateImageWidth)
_stateImageWidth = componentSize.width; _stateImageWidth = componentSize.width;
if (componentSize.height > neededMenuItemHeight) if (componentSize.height > neededMenuItemHeight)
neededMenuItemHeight = componentSize.height; neededMenuItemHeight = componentSize.height;
// NSMixedState // NSMixedState
componentSize = [[_menuItem mixedStateImage] size]; if ([_menuItem mixedStateImage])
componentSize = [[_menuItem mixedStateImage] size];
if (componentSize.width > _stateImageWidth) if (componentSize.width > _stateImageWidth)
_stateImageWidth = componentSize.width; _stateImageWidth = componentSize.width;
if (componentSize.height > neededMenuItemHeight) if (componentSize.height > neededMenuItemHeight)

11
Source/externs.m
View file

@ -421,3 +421,14 @@ const NSWindowDepth NSTwentyFourBitRGBDepth = 520; // 1000001000 RGB | 8bps
const NSWindowDepth _GSWindowDepths[7] = { 258, 264, 514, 516, 517, 520, 0 }; const NSWindowDepth _GSWindowDepths[7] = { 258, 264, 514, 516, 517, 520, 0 };
/* End of color functions externs */ /* End of color functions externs */
extern void __objc_gui_force_linking (void);
void
__objc_gui_force_linking (void)
{
extern void __objc_gui_linking (void);
__objc_gui_linking ();
}

7
TextConverters/RTF/GNUmakefile
View file

@ -33,6 +33,13 @@ RTFConverter_C_FILES = \
RTFConverter_PRINCIPAL_CLASS = RTFConsumer RTFConverter_PRINCIPAL_CLASS = RTFConsumer
ifeq ($(GNUSTEP_TARGET_OS),mingw32)
RTFConverter_BUNDLE_LIBS += -lgnustep-gui $(FND_LIBS) $(OBJC_LIBS)
endif
ifeq ($(GNUSTEP_TARGET_OS),cygwin)
RTFConverter_BUNDLE_LIBS += -lgnustep-gui $(FND_LIBS) $(OBJC_LIBS)
endif
-include GNUmakefile.preamble -include GNUmakefile.preamble
include $(GNUSTEP_MAKEFILES)/bundle.make include $(GNUSTEP_MAKEFILES)/bundle.make