1 |
Index: src/wadlist.cc |
2 |
=================================================================== |
3 |
--- src/wadlist.cc |
4 |
+++ src/wadlist.cc 2007-01-15 00:22:37.206206861 +0100 |
5 |
@@ -175,7 +175,7 @@ |
6 |
priv->iter = priv->list.erase (i); |
7 |
if (priv->iter == priv->list.begin ()) |
8 |
{ |
9 |
- priv->iter = 0; // Catch bugs |
10 |
+ // priv->iter = 0; // Catch bugs |
11 |
priv->rewound = true; |
12 |
} |
13 |
} |
14 |
Index: src/yadex.h |
15 |
=================================================================== |
16 |
--- src/yadex.h |
17 |
+++ src/yadex.h 2007-01-15 00:22:21.566103558 +0100 |
18 |
@@ -98,11 +98,11 @@ |
19 |
#define F_I16_D "hd" |
20 |
#define F_I16_H "hX" |
21 |
|
22 |
-typedef unsigned long u32; |
23 |
+typedef unsigned int u32; |
24 |
#define F_U32_D "lu" |
25 |
#define F_U32_H "lX" |
26 |
|
27 |
-typedef signed long i32; |
28 |
+typedef signed int i32; |
29 |
#define F_I32_D "ld" |
30 |
#define F_I32_H "lX" |
31 |
|
32 |
Index: GNUmakefile |
33 |
=================================================================== |
34 |
--- GNUmakefile |
35 |
+++ GNUmakefile 2007-01-15 00:47:30.952073049 +0100 |
36 |
@@ -730,10 +730,10 @@ |
37 |
cp -p $< $@ |
38 |
|
39 |
$(OBJDIR)/%.o: src/%.cc |
40 |
- $(CXX) -c -Iatclib -Iboost -I$(X11INCLUDEDIR) $(CXXFLAGS) $< -o $@ |
41 |
+ $(CXX) -c -Iatclib -Iboost -I$(X11INCLUDEDIR) $(CXXFLAGS) -I$(OBJDIR) $< -o $@ |
42 |
|
43 |
$(DOBJDIR)/%.o: src/%.cc |
44 |
- $(CXX) -c -Iatclib -Iboost -I$(X11INCLUDEDIR) $(DCXXFLAGS) $< -o $@ |
45 |
+ $(CXX) -c -Iatclib -Iboost -I$(X11INCLUDEDIR) $(DCXXFLAGS) -I$(OBJDIR) $< -o $@ |
46 |
|
47 |
# To compile the modules of Atclib |
48 |
# (normal and debugging versions) |
49 |
@@ -746,7 +746,7 @@ |
50 |
# To see the generated assembly code |
51 |
# for the modules of Yadex |
52 |
$(OBJDIR)/%.S: src/%.cc $(MAKEFILE) |
53 |
- $(CXX) $(CXXFLAGS) -S -fverbose-asm -Iatclib -Iboost -I$(X11INCLUDEDIR)\ |
54 |
+ $(CXX) $(CXXFLAGS) -S -fverbose-asm -Iatclib -Iboost -I$(X11INCLUDEDIR) -I$(OBJDIR)\ |
55 |
$< -o $@ |
56 |
|
57 |
# A source file containing the credits |