pegasus/mak/program-windows.mak - diff

Return to program-windows.mak CVS log

Up to [Pegasus] / pegasus / mak

Diff for /pegasus/mak/program-windows.mak between version 1.10 and 1.11

version 1.10, 2007/03/14 20:18:59

version 1.11, 2008/04/09 04:39:18

Line 35

S_OBJECTS = $(TMP_OBJECTS:.s=.obj)

CPP_OBJECTS = $(S_OBJECTS:.cpp=.obj)

OBJECTS = $(CPP_OBJECTS:.c=.obj)

VERSION_RC = $(ROOT)/mak/version-windows.RC

VERSION_RES = $(ROOT)/mak/version-windows.RES

FULL_PROGRAM=$(BIN_DIR)/$(PROGRAM)$(EXE)

FULL_PROGPDB=$(BIN_DIR)/$(PROGRAM)$(PDB)

Line 44

Line 46

EXE_OUTPUT = $(EXE_OUT)$(FULL_PROGRAM)

$(FULL_PROGRAM): $(OBJ_DIR)/target $(BIN_DIR)/target $(OBJECTS) $(FULL_LIBRARIES) $(ERROR)

$(FULL_PROGRAM): $(OBJ_DIR)/target $(BIN_DIR)/target $(OBJECTS) $(VERSION_RES) $(FULL_LIBRARIES) $(ERROR)

ifeq ($(PEGASUS_SUPPORTS_DYNLIB),yes)

Line 53

Line 55

## files

$(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) $(EXTRA_LIBRARIES)

$(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(VERSION_RES) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) $(EXTRA_LIBRARIES)

else

$(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) $(EXE_OUTPUT) $(OBJECTS) $(FULL_LIBRARIES) $(SYS_LIBS) $(EXTRA_LIBRARIES)

$(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) $(EXE_OUTPUT) $(OBJECTS) $(VERSION_RES) $(FULL_LIBRARIES) $(SYS_LIBS) $(EXTRA_LIBRARIES)

endif

$(TOUCH) $(FULL_PROGRAM)

@ $(ECHO)

$(VERSION_RES): $(VERSION_RC)

@ $(RC) /fo $(VERSION_RES) $(VERSION_RC)

include $(ROOT)/mak/objects.mak

FILES_TO_CLEAN = $(OBJECTS) $(FULL_PROGRAM) $(FULL_PROGPDB) $(FULL_PROGILK) $(FULL_PROGLIB) $(FULL_PROGEXP) $(OBJ_DIR)/vc60$(PDB) $(OBJ_DIR)/vc70$(PDB)

Legend:

Removed from v.1.10
changed lines
	Added in v.1.11

No CVS admin address has been configured