blob: 6d72a2ca7ed5492cad4949f177caacab5c946078 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
|
--- a/Makefile.old 2012-11-26 18:58:48.201837870 +0100
+++ b/Makefile 2012-11-27 12:30:16.038998128 +0100
@@ -1,5 +1,5 @@
-METHANE_FLAGS = -DENABLE_SOUND `pkg-config --cflags clanCore-2.2 clanDisplay-2.2 clanApp-2.2 clanGL-2.2 clanGL1-2.2 clanSWRender-2.2 clanSound-2.2 clanMikMod-2.2`
-METHANE_LIBS = `pkg-config --libs clanCore-2.2 clanDisplay-2.2 clanApp-2.2 clanGL-2.2 clanGL1-2.2 clanSWRender-2.2 clanSound-2.2 clanMikMod-2.2`
+METHANE_FLAGS = -DENABLE_SOUND `pkg-config --cflags clanCore-2.3 clanDisplay-2.3 clanApp-2.3 clanGL-2.3 clanGL1-2.3 clanSWRender-2.3 clanSound-2.3 clanMikMod-2.3`
+METHANE_LIBS = `pkg-config --libs clanCore-2.3 clanDisplay-2.3 clanApp-2.3 clanGL-2.3 clanGL1-2.3 clanSWRender-2.3 clanSound-2.3 clanMikMod-2.3`
OBJF = build/game.o build/baddie.o build/methane.o build/target.o build/maps.o build/gfxoff.o build/mapdata.o build/objlist.o build/doc.o build/bitdraw.o build/global.o build/suck.o build/power.o build/goodie.o build/bititem.o build/player.o build/weapon.o build/bitgroup.o build/boss.o build/sound.o build/gasobj.o build/misc.o
@@ -10,7 +10,7 @@
@echo "================================="
methane: ${OBJF}
- g++ ${CXXFLAGS} ${OBJF} -o methane ${METHANE_LIBS}
+ $(CXX) ${LDFLAGS} ${CXXFLAGS} ${OBJF} -o methane ${METHANE_LIBS}
clean:
@rm -Rf build
@@ -23,6 +23,6 @@
build/%.o : sources/%.cpp
@echo " Compiling $<..."
@if [ ! -d build ]; then mkdir build; fi
- gcc ${CXXFLAGS} ${METHANE_FLAGS} -c $< -o $@
+ $(CXX) ${CXXFLAGS} ${METHANE_FLAGS} -c $< -o $@
--- a/sources/methane.cpp.old 2012-11-27 13:49:22.993003266 +0100
+++ b/sources/methane.cpp 2012-11-27 17:37:23.051913777 +0100
@@ -80,15 +80,15 @@
return 0;
}
- CL_AutoPtr<CL_SetupSound> setup_sound;
- CL_AutoPtr<CL_SoundOutput> sound_output;
- CL_AutoPtr<CL_SetupMikMod> setup_mikmod;
+ CL_UniquePtr<CL_SetupSound> setup_sound;
+ CL_UniquePtr<CL_SoundOutput> sound_output;
+ CL_UniquePtr<CL_SetupMikMod> setup_mikmod;
if (GLOBAL_SoundEnable)
{
- setup_sound = new CL_SetupSound;
- sound_output = new CL_SoundOutput(44100);
- setup_mikmod = new CL_SetupMikMod;
+ setup_sound = cl_move(CL_UniquePtr<CL_SetupSound>(new CL_SetupSound));
+ sound_output = cl_move(CL_UniquePtr<CL_SoundOutput>(new CL_SoundOutput(44100)));
+ setup_mikmod = cl_move(CL_UniquePtr<CL_SetupMikMod>(new CL_SetupMikMod));
}
// Set the video mode
--- a/sources/target.cpp.old 2012-11-28 21:34:32.666878913 +0100
+++ b/sources/target.cpp 2012-11-28 21:35:16.371247221 +0100
@@ -132,7 +132,7 @@
CL_GraphicContext gc = m_pWindow->get_gc();
// Find the resources directory:
- CL_String resource_dir = CL_Directory::get_resourcedata("methane");
+ CL_String resource_dir = "@GENTOO_DATADIR@/methane/";
CL_String dataname("page_01.png");
CL_String filename = resource_dir + dataname;
if (!CL_FileHelp::file_exists(filename))
|
GitWeb
