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

Diff for /pegasus/mak/program-windows.mak between version 1.1.2.2 and 1.7

version 1.1.2.2, 2001/10/30 11:56:53 version 1.7, 2005/03/07 19:52:08
Line 5 
Line 5 
 OBJECTS = $(TMP_OBJECTS:.cpp=.obj) OBJECTS = $(TMP_OBJECTS:.cpp=.obj)
  
 FULL_PROGRAM=$(BIN_DIR)/$(PROGRAM)$(EXE) FULL_PROGRAM=$(BIN_DIR)/$(PROGRAM)$(EXE)
   FULL_PROGPDB=$(BIN_DIR)/$(PROGRAM)$(PDB)
   FULL_PROGILK=$(BIN_DIR)/$(PROGRAM)$(ILK)
   FULL_PROGLIB=$(BIN_DIR)/$(PROGRAM)$(LIB_SUFFIX)
   FULL_PROGEXP=$(BIN_DIR)/$(PROGRAM)$(EXP)
  
 EXE_OUTPUT = $(EXE_OUT)$(FULL_PROGRAM) EXE_OUTPUT = $(EXE_OUT)$(FULL_PROGRAM)
  
 $(FULL_PROGRAM): $(OBJ_DIR)/target $(BIN_DIR)/target $(OBJECTS) $(LIBRARIES) $(ERROR)  $(FULL_PROGRAM): $(OBJ_DIR)/target $(BIN_DIR)/target $(OBJECTS) $(FULL_LIBRARIES) $(ERROR)
 ifeq ($(PEGASUS_SUPPORTS_DYNLIB),yes) ifeq ($(PEGASUS_SUPPORTS_DYNLIB),yes)
  
 ## ##
Line 17 
Line 21 
 ## files ## files
 ## ##
  
         $(LINK_WRAPPER) $(CXX) $(FLAGS) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS)          $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) $(EXTRA_LIBRARIES)
 else else
         $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXE_OUTPUT) $(OBJECTS) $(LIBRARIES) $(SYS_LIBS)          $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) $(EXE_OUTPUT) $(OBJECTS) $(FULL_LIBRARIES) $(SYS_LIBS) $(EXTRA_LIBRARIES)
 endif endif
         $(TOUCH) $(FULL_PROGRAM)         $(TOUCH) $(FULL_PROGRAM)
         @ $(ECHO)         @ $(ECHO)
  
 include $(ROOT)/mak/objects.mak include $(ROOT)/mak/objects.mak
  
 FILES_TO_CLEAN = $(OBJECTS) $(FULL_PROGRAM)  FILES_TO_CLEAN = $(OBJECTS) $(FULL_PROGRAM) $(FULL_PROGPDB) $(FULL_PROGILK) $(FULL_PROGLIB) $(FULL_PROGEXP) $(OBJ_DIR)/vc60$(PDB) $(OBJ_DIR)/vc70$(PDB)
  
 include $(ROOT)/mak/clean.mak include $(ROOT)/mak/clean.mak
  


Legend:
Removed from v.1.1.2.2  
changed lines
  Added in v.1.7

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2