Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 125105 Details for
Bug 185576
ebuild using gdc for aba-game "mu-cade"
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
games-action/mucade/files/mucade-0.11.diff
mucade-0.11.diff (text/plain), 14.01 KB, created by
Account removed
on 2007-07-16 20:11:55 UTC
(
hide
)
Description:
games-action/mucade/files/mucade-0.11.diff
Filename:
MIME Type:
Creator:
Account removed
Created:
2007-07-16 20:11:55 UTC
Size:
14.01 KB
patch
obsolete
>diff -Naur mcd/import/ode/common.d mcd-gentoo/import/ode/common.d >--- mcd/import/ode/common.d 2006-02-19 05:57:26.000000000 +0100 >+++ mcd-gentoo/import/ode/common.d 2007-07-14 17:54:05.000000000 +0200 >@@ -24,7 +24,8 @@ > private import std.c.math; > private import std.c.stdlib; > import ode.config; >-import ode.error; >+import ode.error; >+import ode.objects; > > extern(C): > >@@ -68,8 +69,8 @@ > > /* floating point data type, vector, matrix and quaternion types */ > >-alias double dReal; >- >+//alias double dReal; >+alias float dReal; > > /* round an integer up to a multiple of 4, except that 0 and 1 are unmodified > * (used to compute matrix leading dimensions) >@@ -119,8 +120,8 @@ > struct dxWorld; /* dynamics world */ > struct dxSpace; /* collision space */ > struct dxBody; /* rigid body (dynamics object) */ >-struct dxGeom; /* geometry (collision object) */ >-struct dxJoint; >+struct dxGeom { }; >+struct dxJoint { }; > struct dxJointNode; > struct dxJointGroup; > >diff -Naur mcd/import/ode/ode.d mcd-gentoo/import/ode/ode.d >--- mcd/import/ode/ode.d 2006-02-19 05:57:26.000000000 +0100 >+++ mcd-gentoo/import/ode/ode.d 2007-07-14 17:45:38.000000000 +0200 >@@ -23,21 +23,21 @@ > > /* include *everything* here */ > >-import ode.config; >-import ode.compatibility; >-import ode.common; >-import ode.contact; >-import ode.error; >-import ode.memory; >-import ode.odemath; >-import ode.matrix; >-import ode.timer; >-import ode.rotation; >-import ode.mass; >-import ode.misc; >-import ode.objects; >+public import ode.config; >+public import ode.compatibility; >+public import ode.common; >+public import ode.contact; >+public import ode.error; >+public import ode.memory; >+public import ode.odemath; >+public import ode.matrix; >+public import ode.timer; >+public import ode.rotation; >+public import ode.mass; >+public import ode.misc; >+public import ode.objects; > //import ode.odecpp; >-import ode.collision_space; >-import ode.collision; >+public import ode.collision_space; >+public import ode.collision; > //import ode.odecpp_collision; >-import ode.export_dif; >+public import ode.export_dif; >diff -Naur mcd/import/SDL.d mcd-gentoo/import/SDL.d >--- mcd/import/SDL.d 2006-02-19 05:57:25.000000000 +0100 >+++ mcd-gentoo/import/SDL.d 2007-07-14 16:21:18.000000000 +0200 >@@ -20,18 +20,28 @@ > slouken@devolution.com > */ > >-import SDL_types; >-import SDL_getenv; >-import SDL_error; >-import SDL_rwops; >-import SDL_timer; >-import SDL_audio; >-import SDL_cdrom; >-import SDL_joystick; >-import SDL_events; >-import SDL_video; >-import SDL_byteorder; >-import SDL_Version; >+public import SDL_Keysym; >+public import SDL_Version; >+public import SDL_active; >+public import SDL_audio; >+public import SDL_byteorder; >+public import SDL_cdrom; >+public import SDL_copying; >+public import SDL_endian; >+public import SDL_error; >+public import SDL_events; >+public import SDL_getenv; >+public import SDL_joystick; >+public import SDL_keyboard; >+public import SDL_mouse; >+public import SDL_mutex; >+public import SDL_quit; >+public import SDL_rwops; >+public import SDL_syswm; >+public import SDL_thread; >+public import SDL_timer; >+public import SDL_types; >+public import SDL_video; > > extern(C): > >diff -Naur mcd/Makefile mcd-gentoo/Makefile >--- mcd/Makefile 1970-01-01 01:00:00.000000000 +0100 >+++ mcd-gentoo/Makefile 2007-07-14 22:56:37.000000000 +0200 >@@ -0,0 +1,26 @@ >+DC=gdmd >+#DC=gdc >+ifeq ($(DC), gdmd) >+DFLAGS=-O -g -debug -d -release -Iimport -Isrc >+#DFLAGS=-g -debug -Iimport -Isrc >+DOUT=-of >+else >+DFLAGS=-O -frelease -Iimport -Isrc >+#DFLAGS=-g -fdebug -Iimport -Isrc >+DOUT=-o >+endif >+ >+DSRC=$(shell find src/abagames -name "*.d") >+SOURCES=$(DSRC) import/SDL_video.d import/SDL_mixer.d $(wildcard import/ode/*.d) >+OBJS=$(SOURCES:.d=.o) >+EXE=mucade >+ >+all: $(EXE) >+ >+$(EXE): $(OBJS) >+ gcc -o $@ $(OBJS) -lbulletml_d -lgphobos -lpthread -lm -lSDL -lGL -lGLU -lSDL_mixer -lstdc++ -lode >+ >+$(OBJS): %.o: %.d >+ $(DC) -c $(DOUT)$@ $(DFLAGS) $< >+ >+ >diff -Naur mcd/src/abagames/mcd/barrage.d mcd-gentoo/src/abagames/mcd/barrage.d >--- mcd/src/abagames/mcd/barrage.d 2006-03-18 03:42:50.000000000 +0100 >+++ mcd-gentoo/src/abagames/mcd/barrage.d 2007-07-14 23:00:38.000000000 +0200 >@@ -58,11 +58,12 @@ > public class BarrageManager { > private: > static BulletMLParserTinyXML *parser[char[]][char[]]; >- static const char[] BARRAGE_DIR_NAME = "barrage"; >+ static const char[] BARRAGE_DIR_NAME = "/usr/share/games/mucade/barrage"; > > public static void load() { > char[][] dirs = listdir(BARRAGE_DIR_NAME); >- foreach (char[] dirName; dirs) { >+ foreach (char[] dirName; dirs) { >+ parser[dirName] = null; > char[][] files = listdir(BARRAGE_DIR_NAME ~ "/" ~ dirName); > foreach (char[] fileName; files) { > if (getExt(fileName) != "xml") >diff -Naur mcd/src/abagames/mcd/enemy.d mcd-gentoo/src/abagames/mcd/enemy.d >--- mcd/src/abagames/mcd/enemy.d 2006-03-18 03:42:50.000000000 +0100 >+++ mcd-gentoo/src/abagames/mcd/enemy.d 2007-07-14 16:24:03.000000000 +0200 >@@ -7,7 +7,20 @@ > > private import std.math; > private import opengl; >-private import ode.ode; >+private import ode.ode; >+import ode.config; >+import ode.compatibility; >+import ode.common; >+import ode.contact; >+import ode.error; >+import ode.memory; >+import ode.odemath; >+import ode.matrix; >+import ode.timer; >+import ode.rotation; >+import ode.mass; >+import ode.misc; >+import ode.objects; > private import abagames.util.vector; > private import abagames.util.rand; > private import abagames.util.math; >diff -Naur mcd/src/abagames/mcd/prefmanager.d mcd-gentoo/src/abagames/mcd/prefmanager.d >--- mcd/src/abagames/mcd/prefmanager.d 2006-02-19 05:57:26.000000000 +0100 >+++ mcd-gentoo/src/abagames/mcd/prefmanager.d 2007-07-14 23:03:07.000000000 +0200 >@@ -14,7 +14,7 @@ > public class PrefManager: abagames.util.prefmanager.PrefManager { > private: > static const int VERSION_NUM = 10; >- static const char[] PREF_FILE_NAME = "mcd.prf"; >+ static const char[] PREF_FILE_NAME = "/var/games/mucade/mucade.prf"; > PrefData _prefData; > > public this() { >diff -Naur mcd/src/abagames/mcd/shape.d mcd-gentoo/src/abagames/mcd/shape.d >--- mcd/src/abagames/mcd/shape.d 2006-02-19 05:57:26.000000000 +0100 >+++ mcd-gentoo/src/abagames/mcd/shape.d 2007-07-14 18:05:38.000000000 +0200 >@@ -6,7 +6,20 @@ > module abagames.mcd.shape; > > private import opengl; >-private import ode.ode; >+private import ode.ode; >+import ode.config; >+import ode.compatibility; >+import ode.common; >+import ode.contact; >+import ode.error; >+import ode.memory; >+import ode.odemath; >+import ode.matrix; >+import ode.timer; >+import ode.rotation; >+import ode.mass; >+import ode.misc; >+import ode.objects; > private import abagames.util.vector; > private import abagames.util.sdl.displaylist; > private import abagames.util.ode.odeactor; >@@ -34,7 +47,7 @@ > } > > public void setMass(OdeActor oa, Vector3 sizeScale = null, float massScale = 1) { >- dMass m; >+ dMass m = void; > dMassSetZero(&m); > addMass(&m, sizeScale, massScale); > oa.setMass(m); >@@ -87,7 +100,7 @@ > } > > public void addMass(dMass* m, Vector3 sizeScale = null, float massScale = 1) { >- dMass sm; >+ dMass sm = void; > if (sizeScale) { > dMassSetBox(&sm, 1, size.x * sizeScale.x, size.y * sizeScale.y, size.z * sizeScale.z); > dMassTranslate(&sm, pos.x * sizeScale.x, pos.y * sizeScale.y, pos.z * sizeScale.z); >@@ -436,7 +449,7 @@ > > public void beginRecord() { > posIdx = 0; >- glGetFloatv(GL_MODELVIEW_MATRIX, m); >+ glGetFloatv(GL_MODELVIEW_MATRIX, m.ptr); > } > > public void setPos(Vector3 p) { >diff -Naur mcd/src/abagames/mcd/ship.d mcd-gentoo/src/abagames/mcd/ship.d >--- mcd/src/abagames/mcd/ship.d 2006-03-18 03:42:50.000000000 +0100 >+++ mcd-gentoo/src/abagames/mcd/ship.d 2007-07-14 18:07:15.000000000 +0200 >@@ -7,7 +7,20 @@ > > private import std.math; > private import opengl; >-private import ode.ode; >+private import ode.ode; >+import ode.config; >+import ode.compatibility; >+import ode.common; >+import ode.contact; >+import ode.error; >+import ode.memory; >+import ode.odemath; >+import ode.matrix; >+import ode.timer; >+import ode.rotation; >+import ode.mass; >+import ode.misc; >+import ode.objects; > private import abagames.util.vector; > private import abagames.util.rand; > private import abagames.util.math; >@@ -520,7 +533,7 @@ > Ship ship; > ParticlePool particles; > ConnectedParticlePool connectedParticles; >- dMass m; >+ dMass m = void; > Shape shape; > LinePoint linePoint; > dJointID joint; >diff -Naur mcd/src/abagames/mcd/spec.d mcd-gentoo/src/abagames/mcd/spec.d >--- mcd/src/abagames/mcd/spec.d 2006-03-18 03:42:50.000000000 +0100 >+++ mcd-gentoo/src/abagames/mcd/spec.d 2007-07-14 16:33:53.000000000 +0200 >@@ -7,7 +7,21 @@ > > private import std.math; > private import opengl; >-private import ode.ode; >+private import ode.ode; >+import ode.objects; >+import ode.config; >+import ode.compatibility; >+import ode.common; >+import ode.contact; >+import ode.error; >+import ode.memory; >+import ode.odemath; >+import ode.matrix; >+import ode.timer; >+import ode.rotation; >+import ode.mass; >+import ode.misc; >+import ode.objects; > private import abagames.util.vector; > private import abagames.util.math; > private import abagames.util.ode.odeactor; >diff -Naur mcd/src/abagames/mcd/stagemanager.d mcd-gentoo/src/abagames/mcd/stagemanager.d >--- mcd/src/abagames/mcd/stagemanager.d 2006-03-18 03:42:50.000000000 +0100 >+++ mcd-gentoo/src/abagames/mcd/stagemanager.d 2007-07-14 16:24:25.000000000 +0200 >@@ -9,7 +9,20 @@ > private import std.string; > private import std.stream; > private import opengl; >-private import ode.ode; >+private import ode.ode; >+import ode.config; >+import ode.compatibility; >+import ode.common; >+import ode.contact; >+import ode.error; >+import ode.memory; >+import ode.odemath; >+import ode.matrix; >+import ode.timer; >+import ode.rotation; >+import ode.mass; >+import ode.misc; >+import ode.objects; > private import abagames.util.tokenizer; > private import abagames.util.iterator; > private import abagames.util.rand; >diff -Naur mcd/src/abagames/util/ode/odeactor.d mcd-gentoo/src/abagames/util/ode/odeactor.d >--- mcd/src/abagames/util/ode/odeactor.d 2006-02-19 05:57:26.000000000 +0100 >+++ mcd-gentoo/src/abagames/util/ode/odeactor.d 2007-07-14 16:23:01.000000000 +0200 >@@ -7,7 +7,20 @@ > > private import std.math; > private import opengl; >-private import ode.ode; >+private import ode.ode; >+import ode.config; >+import ode.compatibility; >+import ode.common; >+import ode.contact; >+import ode.error; >+import ode.memory; >+import ode.odemath; >+import ode.matrix; >+import ode.timer; >+import ode.rotation; >+import ode.mass; >+import ode.misc; >+import ode.objects; > private import abagames.util.actor; > private import abagames.util.vector; > private import abagames.util.ode.world; >diff -Naur mcd/src/abagames/util/ode/world.d mcd-gentoo/src/abagames/util/ode/world.d >--- mcd/src/abagames/util/ode/world.d 2006-02-22 23:27:47.000000000 +0100 >+++ mcd-gentoo/src/abagames/util/ode/world.d 2007-07-14 16:23:15.000000000 +0200 >@@ -5,7 +5,20 @@ > */ > module abagames.util.ode.world; > >-private import ode.ode; >+private import ode.ode; >+import ode.config; >+import ode.compatibility; >+import ode.common; >+import ode.contact; >+import ode.error; >+import ode.memory; >+import ode.odemath; >+import ode.matrix; >+import ode.timer; >+import ode.rotation; >+import ode.mass; >+import ode.misc; >+import ode.objects; > private import abagames.util.ode.odeactor; > > /** >diff -Naur mcd/src/abagames/util/sdl/sound.d mcd-gentoo/src/abagames/util/sdl/sound.d >--- mcd/src/abagames/util/sdl/sound.d 2006-02-19 05:57:26.000000000 +0100 >+++ mcd-gentoo/src/abagames/util/sdl/sound.d 2007-07-14 23:02:36.000000000 +0200 >@@ -67,7 +67,7 @@ > public class Music: Sound { > public: > static int fadeOutSpeed = 1280; >- static char[] dir = "sounds/musics"; >+ static char[] dir = "/usr/share/games/mucade/sounds/musics"; > private: > Mix_Music* music; > >@@ -131,7 +131,7 @@ > > public class Chunk: Sound { > public: >- static char[] dir = "sounds/chunks"; >+ static char[] dir = "/usr/share/games/mucade/sounds/chunks"; > private: > Mix_Chunk* chunk; > int chunkChannel; >diff -Naur mcd/src/abagames/util/sdl/texture.d mcd-gentoo/src/abagames/util/sdl/texture.d >--- mcd/src/abagames/util/sdl/texture.d 2006-02-19 05:57:26.000000000 +0100 >+++ mcd-gentoo/src/abagames/util/sdl/texture.d 2007-07-14 23:01:43.000000000 +0200 >@@ -16,7 +16,7 @@ > */ > public class Texture { > public: >- static char[] imagesDir = "images/"; >+ static char[] imagesDir = "/usr/share/games/mucade/images/"; > static SDL_Surface*[char[]] surface; > private: > GLuint num, maskNum; >@@ -103,13 +103,13 @@ > } > glBindTexture(GL_TEXTURE_2D, num + ti); > gluBuild2DMipmaps(GL_TEXTURE_2D, 4, panelWidth, panelHeight, >- GL_RGBA, GL_UNSIGNED_BYTE, pixels); >+ GL_RGBA, GL_UNSIGNED_BYTE, pixels.ptr); > glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR_MIPMAP_NEAREST); > glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR); > if (maskColor != 0xffffffffu) { > glBindTexture(GL_TEXTURE_2D, maskNum + ti); > gluBuild2DMipmaps(GL_TEXTURE_2D, 4, panelWidth, panelHeight, >- GL_RGBA, GL_UNSIGNED_BYTE, maskPixels); >+ GL_RGBA, GL_UNSIGNED_BYTE, maskPixels.ptr); > glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR_MIPMAP_NEAREST); > glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR); > } >diff -Naur mcd/src/abagames/util/sdl/twinstickpad.d mcd-gentoo/src/abagames/util/sdl/twinstickpad.d >--- mcd/src/abagames/util/sdl/twinstickpad.d 2006-03-18 04:36:00.000000000 +0100 >+++ mcd-gentoo/src/abagames/util/sdl/twinstickpad.d 2007-07-14 18:10:59.000000000 +0200 >@@ -8,7 +8,8 @@ > private import std.string; > private import std.stream; > private import std.math; >-private import SDL; >+private import SDL; >+private import SDL_keyboard; > private import abagames.util.vector; > private import abagames.util.sdl.input; > private import abagames.util.sdl.recordableinput;
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=125105">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 185576
:
125073
|
125103
|
125105
|
125582
|
128557
|
128910
|
128911
|
131392
|
136248
|
136250
|
181628
