(file) Return to library-windows.mak CVS log (file) (dir) Up to [Pegasus] / pegasus / mak

Diff for /pegasus/mak/library-windows.mak between version 1.14 and 1.15

version 1.14, 2005/05/12 15:27:28 version 1.15, 2005/10/14 17:50:42
Line 36 
Line 36 
 ## ws2_32.lib is needed to get the WINSOCK routines! ## ws2_32.lib is needed to get the WINSOCK routines!
 ## ##
  
   ##
   ## The next four lines define a variable (called NL) that contains a simple
   ## newline. The two blank lines are needed (please do not remove).
   ##
   define NL
   
   
   endef
   
   ##
   ## The name of the link file to be used by the Windows link command. This is
   ## only used when SOURCES1 is defined.
   ##
   LINKFILE=$(LIB_DIR)/linkfile
   
   ifdef SOURCES1
 $(FULL_LIB): $(BIN_DIR)/target $(LIB_DIR)/target $(OBJ_DIR)/target $(OBJECTS) $(FULL_LIBRARIES) $(ERROR) $(FULL_LIB): $(BIN_DIR)/target $(LIB_DIR)/target $(OBJ_DIR)/target $(OBJECTS) $(FULL_LIBRARIES) $(ERROR)
           @ $(ECHO) "Creating $(LINKFILE)"
           @ $(RM) $(LINKFILE)
           @ $(foreach i, $(OBJECTS), echo $(i) >> $(LINKFILE) $(NL) )
           link -nologo -dll $(LINK_FLAGS) $(EXTRA_LINK_FLAGS) -out:$(FULL_DLL) -implib:$(FULL_LIB) @$(LINKFILE) $(FULL_LIBRARIES) $(SYS_LIBS) $(EXTRA_LIBRARIES)
   else
         link -nologo -dll $(LINK_FLAGS) $(EXTRA_LINK_FLAGS) -out:$(FULL_DLL) -implib:$(FULL_LIB) $(OBJECTS) $(FULL_LIBRARIES) $(SYS_LIBS) $(EXTRA_LIBRARIES)         link -nologo -dll $(LINK_FLAGS) $(EXTRA_LINK_FLAGS) -out:$(FULL_DLL) -implib:$(FULL_LIB) $(OBJECTS) $(FULL_LIBRARIES) $(SYS_LIBS) $(EXTRA_LIBRARIES)
   endif
  
 FILES_TO_CLEAN = \ FILES_TO_CLEAN = \
     $(OBJECTS) $(FULL_LIB) $(FULL_DLL) $(FULL_EXP) $(FULL_ILK) $(FULL_PDB) $(OBJ_DIR)/vc60$(PDB) $(OBJ_DIR)/vc70$(PDB) depend.mak depend.mak.bak     $(OBJECTS) $(FULL_LIB) $(FULL_DLL) $(FULL_EXP) $(FULL_ILK) $(FULL_PDB) $(OBJ_DIR)/vc60$(PDB) $(OBJ_DIR)/vc70$(PDB) depend.mak depend.mak.bak


Legend:
Removed from v.1.14  
changed lines
  Added in v.1.15

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2