(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.1 and 1.4

version 1.1.2.1, 2001/10/28 20:39:22 version 1.4, 2003/07/31 02:43:23
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 19 
Line 23 
  
    $(LINK_WRAPPER) $(CXX) $(FLAGS) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS)    $(LINK_WRAPPER) $(CXX) $(FLAGS) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS)
 else else
    $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXE_OUTPUT) $(OBJECTS) $(LIBRARIES) $(SYS_LIBS)          $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXE_OUTPUT) $(OBJECTS) $(FULL_LIBRARIES) $(SYS_LIBS)
 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)$(PDB)
  
 include $(ROOT)/mak/clean.mak include $(ROOT)/mak/clean.mak
  


Legend:
Removed from v.1.1.2.1  
changed lines
  Added in v.1.4

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2