ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/svn/branches/dev-api-4/xvidcore/vfw/bin/Makefile
(Generate patch)

Comparing branches/dev-api-4/xvidcore/vfw/bin/Makefile (file contents):
Revision 1184 by edgomez, Wed Oct 22 09:52:58 2003 UTC vs.
Revision 1196 by edgomez, Sun Nov 2 19:56:42 2003 UTC

# Line 6 | Line 6
6   # Modified by : Edouard Gomez <ed.gomez at free.fr>
7   #               Peter Ross <pross@xvid.org>
8   #
9 < # $Id: Makefile,v 1.1.2.1 2003-10-22 09:52:58 edgomez Exp $
9 > # Requires GNU Make because of shell expansion performed at a bad time with
10 > # other make programs (even using := variable assignments)
11 > #
12 > # $Id: Makefile,v 1.1.2.2 2003-11-02 19:56:42 edgomez Exp $
13   ##############################################################################
14  
15   include sources.inc
16  
17 < PWD=$(shell pwd)
18 < LOCAL_XVID_SRCTREE=$(PWD)/../../src
19 < LOCAL_XVID_BUILDTREE=$(PWD)/../../build/generic/=build
17 > MAKEFILE_PWD:=$(shell pwd)
18 > LOCAL_XVID_SRCTREE:=$(MAKEFILE_PWD)/../../src
19 > LOCAL_XVID_BUILDTREE:=$(MAKEFILE_PWD)/../../build/generic/=build
20  
21   RM = rm -rf
22   WINDRES=windres
# Line 57 | Line 60 | $(BUILD_DIR):
60   .rc.obj:
61          @echo "  W: $(@D)/$(<F)"
62          @mkdir -p $(BUILD_DIR)/$(@D)
63 <        @$(WINDRES) --include-dir=$(SRC_DIR) -J rc -O coff -o $(BUILD_DIR)/$@ $<
63 >        @$(WINDRES) \
64 >                --include-dir=$(SRC_DIR) \
65 >                --input-format=rc \
66 >                --output-format=coff \
67 >                -o $(BUILD_DIR)/$@ $<
68  
69   .c.obj:
70          @echo "  C: $(@D)/$(<F)"

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines