/[pkgs]/devel/CriticalMass/CriticalMass-1.0.2-sys-curl.patch
ViewVC logotype

Contents of /devel/CriticalMass/CriticalMass-1.0.2-sys-curl.patch

Parent Directory Parent Directory | Revision Log Revision Log

Revision 1.1 - (show annotations) (download) (as text)
Mon Dec 17 18:49:42 2007 UTC (23 months, 1 week ago) by jwrdegoede
Branch: MAIN
CVS Tags: F-12-split, F-10-split, CriticalMass-1_0_2-7_fc12, CriticalMass-1_0_2-4_fc9, F-11-split, CriticalMass-1_0_2-5_fc9, CriticalMass-1_0_2-6_fc11, CriticalMass-1_0_2-3_fc9, CriticalMass-1_0_2-2_fc9, F-9-split, HEAD
File MIME type: text/x-patch 
initial CriticalMass import
1 diff -up CriticalMass-1.0.2/game/Makefile.in~ CriticalMass-1.0.2/game/Makefile.in
2 --- CriticalMass-1.0.2/game/Makefile.in~ 2007-11-29 22:09:43.000000000 +0100
3 +++ CriticalMass-1.0.2/game/Makefile.in 2007-11-29 22:09:43.000000000 +0100
4 @@ -71,7 +71,7 @@ am_critter_OBJECTS = ActionCallbacks.$(O
5 critter_OBJECTS = $(am_critter_OBJECTS)
6 critter_LDADD = $(LDADD)
7 @WIN32_TRUE@am__DEPENDENCIES_1 = critter.res
8 -critter_DEPENDENCIES = ../curl/lib/libcurl.a ../utils/libutils.a \
9 +critter_DEPENDENCIES = ../utils/libutils.a \
10 ../utilssdl/libutilssdl.a ../utilsgl/libutilsgl.a \
11 ../tinyxml/libtinyxml.a $(am__DEPENDENCIES_1)
12 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
13 @@ -231,10 +231,10 @@ critter_SOURCES = \
14 XMLHelper.cpp \
15 main.cpp
16
17 -LDADD = ../curl/lib/libcurl.a ../utils/libutils.a \
18 +LDADD = ../utils/libutils.a -lcurl \
19 ../utilssdl/libutilssdl.a ../utilsgl/libutilsgl.a \
20 ../tinyxml/libtinyxml.a $(am__append_1)
21 -@APPLE_FALSE@@WIN32_FALSE@INCLUDES = -I../curl/include -I../tinyxml -I../utils -I../utilssdl -I../utilsgl -DDATA_DIR=\"$(pkgdatadir)/\"
22 +@APPLE_FALSE@@WIN32_FALSE@INCLUDES = -I../tinyxml -I../utils -I../utilssdl -I../utilsgl -DDATA_DIR=\"$(pkgdatadir)/\"
23 @APPLE_TRUE@@WIN32_FALSE@INCLUDES = -I../curl/include -I../tinyxml -I../utils -I../utilssdl -I../utilsgl -DDATA_DIR=\"/Contents/Resources/\"
24 @WIN32_TRUE@INCLUDES = -I../curl/include -I../tinyxml -I../utils -I../utilssdl -I../utilsgl -DDATA_DIR=\"./\"
25 @WIN32_FALSE@pkgdata_DATA = resource.dat
26 diff -up CriticalMass-1.0.2/game/Makefile.am~ CriticalMass-1.0.2/game/Makefile.am
27 --- CriticalMass-1.0.2/game/Makefile.am~ 2007-11-29 22:09:03.000000000 +0100
28 +++ CriticalMass-1.0.2/game/Makefile.am 2007-11-29 22:09:03.000000000 +0100
29 @@ -41,7 +41,7 @@ critter_SOURCES = \
30 main.cpp
31
32 LDADD = \
33 - ../curl/lib/libcurl.a \
34 + -lcurl \
35 ../utils/libutils.a \
36 ../utilssdl/libutilssdl.a \
37 ../utilsgl/libutilsgl.a \
38 @@ -55,7 +55,7 @@ else
39 if APPLE
40 INCLUDES = -I../curl/include -I../tinyxml -I../utils -I../utilssdl -I../utilsgl -DDATA_DIR=\"/Contents/Resources/\"
41 else
42 -INCLUDES = -I../curl/include -I../tinyxml -I../utils -I../utilssdl -I../utilsgl -DDATA_DIR=\"$(pkgdatadir)/\"
43 +INCLUDES = -I../tinyxml -I../utils -I../utilssdl -I../utilsgl -DDATA_DIR=\"$(pkgdatadir)/\"
44 endif
45
46 endif
47 diff -up CriticalMass-1.0.2/Makefile.in~ CriticalMass-1.0.2/Makefile.in
48 --- CriticalMass-1.0.2/Makefile.in~ 2007-11-29 22:07:06.000000000 +0100
49 +++ CriticalMass-1.0.2/Makefile.in 2007-11-29 22:07:06.000000000 +0100
50 @@ -178,7 +178,7 @@ target_vendor = @target_vendor@
51
52 # require automake 1.4
53 AUTOMAKE_OPTIONS = 1.4
54 -SUBDIRS = curl tinyxml utils utilssdl utilsgl tools data game
55 +SUBDIRS = tinyxml utils utilssdl utilsgl tools data game
56 DIST_SUBDIRS = $(SUBDIRS)
57 man_MANS = critter.6
58 EXTRA_DIST = $(man_MANS)
59 diff -up CriticalMass-1.0.2/Makefile.am~ CriticalMass-1.0.2/Makefile.am
60 --- CriticalMass-1.0.2/Makefile.am~ 2007-11-29 22:06:55.000000000 +0100
61 +++ CriticalMass-1.0.2/Makefile.am 2007-11-29 22:06:55.000000000 +0100
62 @@ -4,7 +4,7 @@
63 AUTOMAKE_OPTIONS = 1.4
64
65 ## Any directories that you want built and installed should go here.
66 -SUBDIRS = curl tinyxml utils utilssdl utilsgl tools data game
67 +SUBDIRS = tinyxml utils utilssdl utilsgl tools data game
68
69 ## Any directories you want a part of the distribution should be listed
70 ## here, as well as have a Makefile generated at the end of configure.in
admin@fedoraproject.org
 ViewVC Help
Powered by ViewVC 1.1.2