* target.make (cygwin/SHARED_LIB_LINK_CMD): Correct lib file name

(Fix from Tom MacSween).
* Instance/framework.make: Add extension to NSExecutable.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@21756 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor 2005-09-29 04:25:01 +00:00
parent 5f5e85cb40
commit d57cd8d4a3
3 changed files with 10 additions and 2 deletions

View file

@ -1,3 +1,9 @@
2005-09-28 Adam Fedor <fedor@gnu.org>
* target.make (cygwin/SHARED_LIB_LINK_CMD): Correct lib file name
(Fix from Tom MacSween).
* Instance/framework.make: Add extension to NSExecutable.
2005-09-22 Adam Fedor <fedor@gnu.org>
* Add runtime flags everywhere for Mac OS/gcc dual runtimes

View file

@ -270,6 +270,7 @@ SONAME_FRAMEWORK_FILE = $(FRAMEWORK_LIBRARY_FILE)
# LIB_LINK_DLL_FILE is the DLL library, Renaissance.dll
LIB_LINK_DLL_FILE = $(GNUSTEP_INSTANCE)$(DLL_LIBEXT)
FRAMEWORK_OBJ_EXT = $(DLL_LIBEXT)
endif # BUILD_DLL
FRAMEWORK_FILE_NAME := $(FRAMEWORK_LIBRARY_DIR_NAME)/$(VERSION_FRAMEWORK_LIBRARY_FILE)
@ -534,7 +535,7 @@ $(FRAMEWORK_VERSION_DIR)/Resources/Info.plist: $(FRAMEWORK_VERSION_DIR)/Resource
# GNUstep frameworks
$(FRAMEWORK_VERSION_DIR)/Resources/Info-gnustep.plist: $(FRAMEWORK_VERSION_DIR)/Resources $(DUMMY_FRAMEWORK_FILE)
$(ECHO_CREATING)(echo "{"; echo ' NOTE = "Automatically generated, do not edit!";'; \
echo " NSExecutable = \"$(GNUSTEP_INSTANCE)\";"; \
echo " NSExecutable = \"$(GNUSTEP_INSTANCE)$(FRAMEWORK_OBJ_EXT)\";"; \
echo " NSMainNibFile = \"$(MAIN_MODEL_FILE)\";"; \
echo " NSPrincipalClass = \"$(PRINCIPAL_CLASS)\";"; \
echo " Classes = "; \

View file

@ -931,7 +931,7 @@ HAVE_SHARED_LIBS = yes
# the import library
SHARED_LIB_LINK_CMD = \
$(CC) $(SHARED_LD_PREFLAGS) -shared -o $(GNUSTEP_OBJ_DIR)/$(LIB_LINK_DLL_FILE) \
-Wl,--out-implib=$(GNUSTEP_OBJ_DIR)/$(LIB_LINK_FILE) \
-Wl,--out-implib=$(GNUSTEP_OBJ_DIR)/$(LIB_LINK_VERSION_FILE) \
-Wl,--export-all-symbols \
-Wl,--enable-auto-import \
-Wl,--whole-archive $(OBJ_FILES_TO_LINK) $(ALL_LDFLAGS) \
@ -944,6 +944,7 @@ SHARED_LIBEXT = .dll.a
BUILD_DLL = yes
CYGWIN_DLL_SUPPORT = yes
#SHARED_LIBEXT = .a
DLL_LIBEXT = .dll
REBASE = rebase
REBASE_FLAGS = -d -b 0x68000000 -o 0x10000