diff options
Diffstat (limited to 'games-arcade/methane/files/methane-1.5.1-gentoo.patch')
-rw-r--r-- | games-arcade/methane/files/methane-1.5.1-gentoo.patch | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/games-arcade/methane/files/methane-1.5.1-gentoo.patch b/games-arcade/methane/files/methane-1.5.1-gentoo.patch deleted file mode 100644 index 26a1b438c8a8..000000000000 --- a/games-arcade/methane/files/methane-1.5.1-gentoo.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -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 -+++ b/sources/methane.cpp -@@ -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 -+++ b/sources/target.cpp -@@ -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)) |