Fixed compilation on windows with newer gnustep-make, and removed a compiler warning

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/gorm/trunk@25916 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2008-01-10 11:43:37 +00:00
parent d5556cc6b0
commit 930b3ded83
3 changed files with 23 additions and 4 deletions

View file

@ -1,3 +1,15 @@
2008-01-10 Nicola Pero <nicola.pero@meta-innovation.com>
* GNUmakefile.postamble (LN_S_RECURSIVE): For
backwards-compatibility with older versions of gnustep-make,
define to be the same as LN_S if not defined yet.
(before-all): Use RM_LN_S to delete the symlink, and use
LN_S_RECURSIVE to create it.
(after-clean): Use RM_LN_S to delete the symlink.
* GormPrefs/GormPrefController.m ([-init]): Avoid compiler
warning.
2008-01-07 20:04-EST Gregory John Casamento <greg_casamento@yahoo.com>
* Palettes/0Menus/GormMenuItemAttributesInspector.h

View file

@ -24,9 +24,15 @@
# USA.
#
# Define this variable if not defined for backwards-compatibility as
# it is only available in gnustep-make >= 2.0.5
ifeq ($(LN_S_RECURSIVE),)
LN_S_RECURSIVE = $(LN_S)
endif
before-all::
rm -rf InterfaceBuilder
$(LN_S) GormLib InterfaceBuilder
$(RM_LN_S) InterfaceBuilder; \
$(LN_S_RECURSIVE) GormLib InterfaceBuilder
after-all::
@ -35,4 +41,4 @@ after-clean::
after-distclean::
after-clean::
rm -rf InterfaceBuilder
$(RM_LN_S) InterfaceBuilder

View file

@ -15,7 +15,8 @@
- (id) init
{
if(self = [super init])
self = [super init];
if (self != nil)
{
if(![NSBundle loadNibNamed: @"GormPreferences" owner: self])
{