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

Diff for /pegasus/mak/library.mak between version 1.18 and 1.19

version 1.18, 2005/10/10 00:39:05 version 1.19, 2006/01/24 19:44:18
Line 47 
Line 47 
 TMP_OBJECTS = $(foreach i,$(SOURCES),$(OBJ_DIR)/$i) TMP_OBJECTS = $(foreach i,$(SOURCES),$(OBJ_DIR)/$i)
  
 ifeq ($(OS_TYPE),windows) ifeq ($(OS_TYPE),windows)
 CPP_OBJECTS = $(TMP_OBJECTS:.cpp=.obj)  S_OBJECTS = $(TMP_OBJECTS:.s=.obj)
   CPP_OBJECTS = $(S_OBJECTS:.cpp=.obj)
 OBJECTS = $(CPP_OBJECTS:.c=.obj) OBJECTS = $(CPP_OBJECTS:.c=.obj)
 else else
 CPP_OBJECTS = $(TMP_OBJECTS:.cpp=.o)  S_OBJECTS = $(TMP_OBJECTS:.s=.o)
   CPP_OBJECTS = $(S_OBJECTS:.cpp=.o)
 OBJECTS = $(CPP_OBJECTS:.c=.o) OBJECTS = $(CPP_OBJECTS:.c=.o)
 endif endif
  


Legend:
Removed from v.1.18  
changed lines
  Added in v.1.19

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2