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.6 and 1.12

version 1.6, 2005/02/12 00:01:28

version 1.12, 2008/12/01 17:49:05

Line 1

#//%LICENSE////////////////////////////////////////////////////////////////

#//

#// Licensed to The Open Group (TOG) under one or more contributor license

#// agreements. Refer to the OpenPegasusNOTICE.txt file distributed with

#// this work for additional information regarding copyright ownership.

#// Each contributor licenses this file to you under the OpenPegasus Open

#// Source License; you may not use this file except in compliance with the

#// License.

#//

#// Permission is hereby granted, free of charge, to any person obtaining a

#// copy of this software and associated documentation files (the "Software"),

#// to deal in the Software without restriction, including without limitation

#// the rights to use, copy, modify, merge, publish, distribute, sublicense,

#// and/or sell copies of the Software, and to permit persons to whom the

#// Software is furnished to do so, subject to the following conditions:

#//

#// The above copyright notice and this permission notice shall be included

#// in all copies or substantial portions of the Software.

#//

#// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

#// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

#// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

#// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY

#// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,

#// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE

#// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

#//

#//////////////////////////////////////////////////////////////////////////

INCLUDES = -I$(ROOT)/src $(EXTRA_INCLUDES)

TMP_OBJECTS = $(foreach i,$(SOURCES),$(OBJ_DIR)/$i)

OBJECTS = $(TMP_OBJECTS:.cpp=.obj)

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 12

Line 44

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 21

Line 53

## files

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

$(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)

$(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.6
changed lines
	Added in v.1.12

No CVS admin address has been configured