Menu
▾
▴
sdlmm-commits — Mailing list to which CVS commit messages are sent.
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
(78) |
May
(2) |
Jun
(43) |
Jul
(54) |
Aug
(16) |
Sep
|
Oct
|
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2007 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: coleman k. <co...@us...> - 2007-01-19 18:28:57
|
Update of /cvsroot/sdlmm/SDLmm/src In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv17066/src Modified Files: sdlmm_eventhandler.h sdlmm_event.cpp Log Message: On a SysWM Event, allow the SysWMmsg to be passed down to the EventHandler that is handling events. Index: sdlmm_eventhandler.h =================================================================== RCS file: /cvsroot/sdlmm/SDLmm/src/sdlmm_eventhandler.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sdlmm_eventhandler.h 27 Aug 2001 02:11:14 -0000 1.7 +++ sdlmm_eventhandler.h 19 Jan 2007 18:28:47 -0000 1.8 @@ -20,6 +20,7 @@ #ifndef SDLMM_EVENTHANDLER_H #define SDLMM_EVENTHANDLER_H +#include <SDL_syswm.h> namespace SDLmm { //! The base class used for custom Event handlers. @@ -450,7 +451,7 @@ the event wasn't handled, it will be handed over to the generic HandleEvent() method. */ - virtual bool HandleSysWMEvent() { + virtual bool HandleSysWMEvent(SDL_SysWMmsg &msg) { return false; } Index: sdlmm_event.cpp =================================================================== RCS file: /cvsroot/sdlmm/SDLmm/src/sdlmm_event.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sdlmm_event.cpp 27 Aug 2001 02:11:14 -0000 1.9 +++ sdlmm_event.cpp 19 Jan 2007 18:28:47 -0000 1.10 @@ -167,7 +167,7 @@ ev_handled = handler.HandleQuitEvent(); break; case SDL_SYSWMEVENT: - ev_handled = handler.HandleSysWMEvent(); + ev_handled = handler.HandleSysWMEvent(*(event.syswm.msg)); break; case SDL_VIDEORESIZE: ev_handled = handler.HandleResizeEvent(event.resize.w, event.resize.h); |
|
From: David H. <ne...@us...> - 2005-03-28 18:10:36
|
Update of /cvsroot/sdlmm/SDLmm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12295 Modified Files: autogen.sh Log Message: Make sure that needed automake files are installed/up-to-date. Index: autogen.sh =================================================================== RCS file: /cvsroot/sdlmm/SDLmm/autogen.sh,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- autogen.sh 13 Aug 2001 19:39:41 -0000 1.10 +++ autogen.sh 28 Mar 2005 18:10:25 -0000 1.11 @@ -4,7 +4,7 @@ aclocal -I . autoheader -automake --no-force --gnu +automake --no-force --gnu -af autoconf #./test/autogen.sh |
|
From: Adam G. <ra...@us...> - 2001-08-30 23:58:49
|
Update of /cvsroot/sdlmm/SDLmm/src
In directory usw-pr-cvs1:/tmp/cvs-serv23163
Modified Files:
sdlmm_srect.cpp
Log Message:
Added in a missing include.
Index: sdlmm_srect.cpp
===================================================================
RCS file: /cvsroot/sdlmm/SDLmm/src/sdlmm_srect.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sdlmm_srect.cpp 2001/08/30 05:59:45 1.8
+++ sdlmm_srect.cpp 2001/08/30 23:58:45 1.9
@@ -25,6 +25,7 @@
#include <SDL.h>
#include "sdlmm_srect.h"
+#include "sdlmm_misc.h"
namespace SDLmm {
SRect::SRect() {
|
|
From: Adam G. <ra...@us...> - 2001-08-30 06:00:45
|
Update of /cvsroot/sdlmm/SDLmm/VisualC In directory usw-pr-cvs1:/tmp/cvs-serv4778 Modified Files: libsdlmm.dsp sdlmm.dsp Log Message: Added in new file: sdlmm_misc.h Index: libsdlmm.dsp =================================================================== RCS file: /cvsroot/sdlmm/SDLmm/VisualC/libsdlmm.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libsdlmm.dsp 2001/08/13 01:55:31 1.1 +++ libsdlmm.dsp 2001/08/30 06:00:43 1.2 @@ -163,6 +163,10 @@ # End Source File # Begin Source File +SOURCE=..\src\sdlmm_misc.h +# End Source File +# Begin Source File + SOURCE=..\src\sdlmm_display.h # End Source File # Begin Source File Index: sdlmm.dsp =================================================================== RCS file: /cvsroot/sdlmm/SDLmm/VisualC/sdlmm.dsp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sdlmm.dsp 2001/08/13 01:55:31 1.5 +++ sdlmm.dsp 2001/08/30 06:00:43 1.6 @@ -170,6 +170,10 @@ # End Source File # Begin Source File +SOURCE=..\src\sdlmm_misc.h +# End Source File +# Begin Source File + SOURCE=..\src\sdlmm_display.h # End Source File # Begin Source File |
|
From: Adam G. <ra...@us...> - 2001-08-30 05:59:48
|
Update of /cvsroot/sdlmm/SDLmm/src
In directory usw-pr-cvs1:/tmp/cvs-serv4030
Modified Files:
Makefile.am sdlmm.h sdlmm_srect.cpp sdlmm_srect.h
sdlmm_timer.h
Added Files:
sdlmm_misc.h
Log Message:
Added a few fucntions to SRect. ie Move, Contains, Union, Intersect
--- NEW FILE ---
/*
* SDLmm - a C++ wrapper for SDL and related libraries
* Copyright © 2001 David Hedbor <da...@he...>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
*/
#ifndef SDLMM_MISC_H
#define SDLMM_MISC_H
namespace SDLmm {
//! Find the maximum of two values.
template <class T>
inline const T& Max(const T& t1, const T& t2)
{
if (t1 < t2)
return t2;
else
return t1;
}
//! Find the minimum of two values.
template <class T>
inline const T& Min(const T& t1, const T& t2)
{
if (t1 < t2)
return t1;
else
return t2;
}
}
#endif // SDLMM_MISC_H
Index: Makefile.am
===================================================================
RCS file: /cvsroot/sdlmm/SDLmm/src/Makefile.am,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Makefile.am 2001/07/06 20:41:18 1.22
+++ Makefile.am 2001/08/30 05:59:45 1.23
@@ -3,7 +3,7 @@
# The SDL library target
lib_LTLIBRARIES = libSDLmm.la
-HDRS=sdlmm_global.h sdlmm.h sdlmm_spoint.h sdlmm_srect.h sdlmm_color.h sdlmm_surface.h sdlmm_videoinfo.h \
+HDRS=sdlmm_global.h sdlmm_misc.h sdlmm.h sdlmm_spoint.h sdlmm_srect.h sdlmm_color.h sdlmm_surface.h sdlmm_videoinfo.h \
sdlmm_display.h sdlmm_basesurface.h sdlmm_pixelformat.h sdlmm_event.h sdlmm_eventhandler.h \
sdlmm_audio.h sdlmm_timer.h sdlmm_joystick.h sdlmm_cd.h sdlmm_config.h
Index: sdlmm.h
===================================================================
RCS file: /cvsroot/sdlmm/SDLmm/src/sdlmm.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sdlmm.h 2001/07/26 20:10:26 1.17
+++ sdlmm.h 2001/08/30 05:59:45 1.18
@@ -123,6 +123,7 @@
#undef PACKAGE
#undef VERSION
#include "sdlmm_global.h"
+#include "sdlmm_misc.h"
#include "sdlmm_spoint.h"
#include "sdlmm_srect.h"
#include "sdlmm_color.h"
Index: sdlmm_srect.cpp
===================================================================
RCS file: /cvsroot/sdlmm/SDLmm/src/sdlmm_srect.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sdlmm_srect.cpp 2001/07/06 20:30:38 1.7
+++ sdlmm_srect.cpp 2001/08/30 05:59:45 1.8
@@ -66,5 +66,27 @@
w = bottom_right_point.x - upper_left_point.x;
h = bottom_right_point.y - upper_left_point.y;
}
+
+ SRect Intersect(const SRect& r1, const SRect& r2) {
+ SRect r;
+ r.x = Max(r1.x, r2.x);
+ r.y = Max(r1.y, r2.y);
+ r.w = Min(r1.x + r1.w, r2.x + r2.w) - r.x;
+ r.h = Min(r1.y + r1.h, r2.y + r2.h) - r.y;
+ if (r.w < 0) r.w = 0;
+ if (r.h < 0) r.h = 0;
+ return r;
+ }
+
+ SRect Union(const SRect& r1, const SRect& r2) {
+ SRect r;
+ r.x = Min(r1.x, r2.x);
+ r.y = Min(r1.y, r2.y);
+ r.w = Max(r1.x + r1.w, r2.x + r2.w) - r.x;
+ r.h = Max(r1.y + r1.h, r2.y + r2.h) - r.y;
+ ASSERT(r.w >= 0);
+ ASSERT(r.h >= 0);
+ return r;
+ }
}
Index: sdlmm_srect.h
===================================================================
RCS file: /cvsroot/sdlmm/SDLmm/src/sdlmm_srect.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sdlmm_srect.h 2001/08/07 00:36:38 1.17
+++ sdlmm_srect.h 2001/08/30 05:59:45 1.18
@@ -69,7 +69,7 @@
\param bottom_right_point SPoint for the bottom right corner of the rectangle
*/
SRect(const SPoint &upper_left_point,
- const SPoint &bottom_right_point);
+ const SPoint &bottom_right_point);
//! Constructor which initializes the class from an SPoint object
//! and integer values.
@@ -110,9 +110,23 @@
*/
bool operator==(const SDL_Rect& rect) const {
return ((x == rect.x) && (y == rect.y) &&
- (w == rect.w) && (h == rect.h));
+ (w == rect.w) && (h == rect.h));
}
+ //! Move the position of the rectangle.
+ /*!
+ \param point difference to move by.
+ */
+ void Move(const SPoint& point) {
+ x += point.x; y += point.y;
+ }
+
+ //! Is the point in the rectangle?
+ bool Contains(const SPoint& point) const {
+ return (x <= point.x) && (y <= point.y) &&
+ ((x+w) > point.x) && ((y+h) > point.y);
+ }
+
//! Get the coordinates for the upper left corner of the SRect
/*! \return SPoint object */
SPoint GetUpperLeft() const { return SPoint(x, y); }
@@ -127,6 +141,16 @@
SPoint GetBottomRight() const { return SPoint(x+w, y+h); }
};
+
+ //! Get intersection rectangle of two rectangles
+ /*! The intersection rectangle is the largest rectangle that is
+ contained by both r1 and r2. */
+ SRect Intersect(const SRect& r1, const SRect& r2);
+
+ //! Get union rectangle of two rectangles
+ /*! The union rectangle is the smallest rectangle that is
+ contains both r1 and r2. */
+ SRect Union(const SRect& r1, const SRect& r2);
}
#endif // SDLMM_SRECT_H
Index: sdlmm_timer.h
===================================================================
RCS file: /cvsroot/sdlmm/SDLmm/src/sdlmm_timer.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sdlmm_timer.h 2001/08/13 01:56:26 1.7
+++ sdlmm_timer.h 2001/08/30 05:59:45 1.8
@@ -38,9 +38,6 @@
void Mark();
unsigned int GetElapsed() const {
- // What is the purpose of this assertion?
- // it will always be true since Ticks is an unsigned int/grendel
- // ASSERT(m_Elapsed >= 0);
return m_Elapsed;
}
|
|
From: David H. <ne...@us...> - 2001-08-27 22:14:56
|
Update of /cvsroot/sdlmm/SDLmm/src
In directory usw-pr-cvs1:/tmp/cvs-serv14692
Modified Files:
sdlmm_basesurface.cpp
Log Message:
Fixed a bug in GetPixel.
Index: sdlmm_basesurface.cpp
===================================================================
RCS file: /cvsroot/sdlmm/SDLmm/src/sdlmm_basesurface.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sdlmm_basesurface.cpp 2001/07/16 22:32:43 1.17
+++ sdlmm_basesurface.cpp 2001/08/27 22:14:53 1.18
@@ -157,7 +157,7 @@
break;
case 4:
- return *((const Uint32 *)(pixels()));
+ return *((const Uint32 *)(the_pixel));
break;
default:
|
|
From: Adam G. <ra...@us...> - 2001-08-27 02:14:43
|
Update of /cvsroot/sdlmm/SDLmm/test
In directory usw-pr-cvs1:/tmp/cvs-serv29776
Modified Files:
sprite.cpp
Log Message:
Fix for const change in eventhandler.
Index: sprite.cpp
===================================================================
RCS file: /cvsroot/sdlmm/SDLmm/test/sprite.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sprite.cpp 2001/07/09 01:21:11 1.25
+++ sprite.cpp 2001/08/27 02:14:41 1.26
@@ -28,7 +28,7 @@
public:
MyEventHandler() : keep_going(true) { }
- bool HandleKeyPressEvent(SDL_keysym &keysym) {
+ bool HandleKeyPressEvent(const SDL_keysym &keysym) {
std::cout << "Got kbd press event: sym = "
<< keysym.sym << " ("
<< Event::GetKeyName(keysym.sym) << ").\n";
|
|
From: Adam G. <ra...@us...> - 2001-08-27 02:11:17
|
Update of /cvsroot/sdlmm/SDLmm/src
In directory usw-pr-cvs1:/tmp/cvs-serv28497
Modified Files:
sdlmm_event.cpp sdlmm_event.h sdlmm_eventhandler.h
Log Message:
Split Event::HandleEvents into Event::HandleEvent to handle a single event.
Note the change in constness of the eventhandler class functions.
Class deriving from eventhandler will silently fail due to this change.
Index: sdlmm_event.cpp
===================================================================
RCS file: /cvsroot/sdlmm/SDLmm/src/sdlmm_event.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sdlmm_event.cpp 2001/06/25 23:24:52 1.8
+++ sdlmm_event.cpp 2001/08/27 02:11:14 1.9
@@ -105,78 +105,82 @@
void Event::HandleEvents(EventHandler &handler) {
SDL_Event event;
while(SDL_PollEvent(&event)) {
- bool ev_handled = false;
- switch(event.type) {
- case SDL_ACTIVEEVENT:
- ev_handled = handler.HandleActiveEvent(event.active.gain == 1,
- event.active.state);
- break;
- case SDL_KEYDOWN:
- ev_handled = handler.HandleKeyPressEvent(event.key.keysym);
- break;
- case SDL_KEYUP:
- ev_handled = handler.HandleKeyReleaseEvent(event.key.keysym);
- break;
- case SDL_MOUSEMOTION:
- ev_handled = handler.HandleMouseMotionEvent(event.motion.state,
- event.motion.x,
- event.motion.y,
- event.motion.xrel,
- event.motion.yrel);
- break;
- case SDL_MOUSEBUTTONDOWN:
- ev_handled = handler.HandleMouseButtonPressEvent(event.button.button,
- event.button.x,
- event.button.y);
- break;
- case SDL_MOUSEBUTTONUP:
- ev_handled = handler.HandleMouseButtonReleaseEvent(event.button.button,
- event.button.x,
- event.button.y);
- break;
- case SDL_JOYAXISMOTION:
- ev_handled = handler.HandleJoyAxisEvent(event.jaxis.which,
- event.jaxis.axis,
- event.jaxis.value);
- break;
- case SDL_JOYBALLMOTION:
- ev_handled = handler.HandleJoyBallEvent(event.jball.which,
- event.jball.ball,
- event.jball.xrel,
- event.jball.yrel);
- break;
- case SDL_JOYHATMOTION:
- ev_handled = handler.HandleJoyHatEvent(event.jhat.which,
- event.jhat.hat,
- event.jhat.value);
- break;
- case SDL_JOYBUTTONDOWN:
- ev_handled = handler.HandleJoyButtonPressEvent(event.jbutton.which,
- event.jbutton.button);
- break;
- case SDL_JOYBUTTONUP:
- ev_handled = handler.HandleJoyButtonReleaseEvent(event.jbutton.which,
- event.jbutton.button);
- break;
- case SDL_QUIT:
- ev_handled = handler.HandleQuitEvent();
- break;
- case SDL_SYSWMEVENT:
- ev_handled = handler.HandleSysWMEvent();
- break;
- case SDL_VIDEORESIZE:
- ev_handled = handler.HandleResizeEvent(event.resize.w, event.resize.h);
- break;
- case SDL_USEREVENT:
- ev_handled = handler.HandleUserEvent(event.user.type,
- event.user.code,
- event.user.data1,
- event.user.data2);
- break;
- }
- if(!ev_handled) {
- handler.HandleEvent(event);
- }
+ HandleEvent(handler, event);
+ }
+ }
+
+ void Event::HandleEvent(EventHandler &handler, const SDL_Event& event) {
+ bool ev_handled = false;
+ switch(event.type) {
+ case SDL_ACTIVEEVENT:
+ ev_handled = handler.HandleActiveEvent(event.active.gain == 1,
+ event.active.state);
+ break;
+ case SDL_KEYDOWN:
+ ev_handled = handler.HandleKeyPressEvent(event.key.keysym);
+ break;
+ case SDL_KEYUP:
+ ev_handled = handler.HandleKeyReleaseEvent(event.key.keysym);
+ break;
+ case SDL_MOUSEMOTION:
+ ev_handled = handler.HandleMouseMotionEvent(event.motion.state,
+ event.motion.x,
+ event.motion.y,
+ event.motion.xrel,
+ event.motion.yrel);
+ break;
+ case SDL_MOUSEBUTTONDOWN:
+ ev_handled = handler.HandleMouseButtonPressEvent(event.button.button,
+ event.button.x,
+ event.button.y);
+ break;
+ case SDL_MOUSEBUTTONUP:
+ ev_handled = handler.HandleMouseButtonReleaseEvent(event.button.button,
+ event.button.x,
+ event.button.y);
+ break;
+ case SDL_JOYAXISMOTION:
+ ev_handled = handler.HandleJoyAxisEvent(event.jaxis.which,
+ event.jaxis.axis,
+ event.jaxis.value);
+ break;
+ case SDL_JOYBALLMOTION:
+ ev_handled = handler.HandleJoyBallEvent(event.jball.which,
+ event.jball.ball,
+ event.jball.xrel,
+ event.jball.yrel);
+ break;
+ case SDL_JOYHATMOTION:
+ ev_handled = handler.HandleJoyHatEvent(event.jhat.which,
+ event.jhat.hat,
+ event.jhat.value);
+ break;
+ case SDL_JOYBUTTONDOWN:
+ ev_handled = handler.HandleJoyButtonPressEvent(event.jbutton.which,
+ event.jbutton.button);
+ break;
+ case SDL_JOYBUTTONUP:
+ ev_handled = handler.HandleJoyButtonReleaseEvent(event.jbutton.which,
+ event.jbutton.button);
+ break;
+ case SDL_QUIT:
+ ev_handled = handler.HandleQuitEvent();
+ break;
+ case SDL_SYSWMEVENT:
+ ev_handled = handler.HandleSysWMEvent();
+ break;
+ case SDL_VIDEORESIZE:
+ ev_handled = handler.HandleResizeEvent(event.resize.w, event.resize.h);
+ break;
+ case SDL_USEREVENT:
+ ev_handled = handler.HandleUserEvent(event.user.type,
+ event.user.code,
+ event.user.data1,
+ event.user.data2);
+ break;
+ }
+ if(!ev_handled) {
+ handler.HandleEvent(event);
}
}
}
Index: sdlmm_event.h
===================================================================
RCS file: /cvsroot/sdlmm/SDLmm/src/sdlmm_event.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sdlmm_event.h 2001/08/07 00:36:38 1.7
+++ sdlmm_event.h 2001/08/27 02:11:14 1.8
@@ -173,9 +173,22 @@
callbacks for the events you're interested in. See the
EventHandler documentation for more details.
\param handler the EventHandler which should handle the events.
- \sa EventHandler
+ \sa EventHandler, HandleEvent
*/
static void HandleEvents(EventHandler &handler);
+
+ //! Handle a single event using the specified EventHandler
+ /*!
+ This function calls the event callback methods. To actually
+ handle any events, you need to create a derivate of the
+ EventHandler class reimplementing the callbacks for the events
+ you're interested in. See the EventHandler documentation for more
+ details.
+ \param handler the EventHandler which should handle the events.
+ \param event the event to handle.
+ \sa EventHandler
+ */
+ static void HandleEvent(EventHandler &handler, const SDL_Event& event);
//@}
Index: sdlmm_eventhandler.h
===================================================================
RCS file: /cvsroot/sdlmm/SDLmm/src/sdlmm_eventhandler.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sdlmm_eventhandler.h 2001/08/07 00:36:38 1.6
+++ sdlmm_eventhandler.h 2001/08/27 02:11:14 1.7
@@ -54,7 +54,7 @@
the event wasn't handled, it will be handed over to the generic
HandleEvent() method.
*/
- virtual bool HandleKeyboardEvent(SDL_keysym &keysym, bool pressed) {
+ virtual bool HandleKeyboardEvent(const SDL_keysym &keysym, bool pressed) {
return false;
}
@@ -75,7 +75,7 @@
the event wasn't handled, it will be handed over to the generic
HandleEvent() method.
*/
- virtual bool HandleKeyPressEvent(SDL_keysym &keysym) {
+ virtual bool HandleKeyPressEvent(const SDL_keysym &keysym) {
return HandleKeyboardEvent(keysym, true);
}
@@ -94,7 +94,7 @@
the event wasn't handled, it will be handed over to the generic
HandleEvent() method.
*/
- virtual bool HandleKeyReleaseEvent(SDL_keysym &keysym) {
+ virtual bool HandleKeyReleaseEvent(const SDL_keysym &keysym) {
return HandleKeyboardEvent(keysym, false);
}
//@}
@@ -516,7 +516,7 @@
\return true if the event was handled, false if it was not
*/
- virtual bool HandleEvent(SDL_Event &event) {
+ virtual bool HandleEvent(const SDL_Event &event) {
return false;
}
|
|
From: David H. <ne...@us...> - 2001-08-13 19:45:55
|
Update of /cvsroot/sdlmm/SDLmm/src
In directory usw-pr-cvs1:/tmp/cvs-serv1212/src
Modified Files:
sdlmm_pixelformat.h
Log Message:
Foo.
Index: sdlmm_pixelformat.h
===================================================================
RCS file: /cvsroot/sdlmm/SDLmm/src/sdlmm_pixelformat.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sdlmm_pixelformat.h 2001/08/07 00:36:38 1.8
+++ sdlmm_pixelformat.h 2001/08/13 19:45:52 1.9
@@ -47,7 +47,7 @@
//! The destructor.
virtual ~PixelFormat() {
- };
+ }
//! \name Informational methods
//@{
|
|
From: David H. <ne...@us...> - 2001-08-13 19:39:45
|
Update of /cvsroot/sdlmm/SDLmm In directory usw-pr-cvs1:/tmp/cvs-serv32289 Modified Files: autogen.sh Added Files: ChangeLog Removed Files: CHANGES Log Message: renamed CHANGES to ChangeLog Index: autogen.sh =================================================================== RCS file: /cvsroot/sdlmm/SDLmm/autogen.sh,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- autogen.sh 2001/07/23 21:50:08 1.9 +++ autogen.sh 2001/08/13 19:39:41 1.10 @@ -4,7 +4,7 @@ aclocal -I . autoheader -automake --no-force --foreign +automake --no-force --gnu autoconf #./test/autogen.sh |
|
From: Adam G. <ra...@us...> - 2001-08-13 02:01:53
|
Update of /cvsroot/sdlmm/SDLmm In directory usw-pr-cvs1:/tmp/cvs-serv22958 Modified Files: README.Win32 Log Message: Updated for the new DLL version. Index: README.Win32 =================================================================== RCS file: /cvsroot/sdlmm/SDLmm/README.Win32,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- README.Win32 2001/07/23 21:27:23 1.5 +++ README.Win32 2001/08/13 02:01:51 1.6 @@ -3,9 +3,10 @@ I have successfully cross compiled SDLmm using VisualC++ 6.0 on a Windows system. In the 'VisualC' subdirectory you should find the -'sdlmm.dsp' and 'sdlmm.dsw' files reqiured for compiling. These -files generate a static library (SDLmm.lib). You will need to update -the include path to point to where you have installed SDL. +'sdlmm.dsp', 'libsdlmm.dsp' and 'sdlmm.dsw' files reqiured for +compiling. These files generate a static library (libSDLmm.lib) +and a DLL (SDLmm.DLL, SDLmm.lib). You will need to update the +include path to point to where you have installed SDL. Once this has built you can try the test programs in the 'test\VisualC' subdirectory. Again you will need to update the @@ -14,14 +15,10 @@ 'SDLmain.lib' files. Note that with these makefiles the release version is compiled with -the multithreaded c-runtime library and the debug version is -compiled with the multithreaded debug c-runtime library. The debug +the multithreaded c-runtime DLL and the debug version is +compiled with the multithreaded debug c-runtime DLL. The debug version also has a 'd' appended to the name so that they can both -exist in the same directory. This is different from the standard SDL -release but I believe this is the better method. When you are -compiling make sure that all projects are compiled against the same -libraries. - +exist in the same directory. Compiling SDLmm on for Win32 using mingw32 (deprecated) |
|
From: Adam G. <ra...@us...> - 2001-08-13 01:58:14
|
Update of /cvsroot/sdlmm/SDLmm/test/VisualC In directory usw-pr-cvs1:/tmp/cvs-serv22460 Modified Files: rect.dsp sprite.dsp vidinfo.dsp Log Message: Changes to reflect sdlmm changes. Index: rect.dsp =================================================================== RCS file: /cvsroot/sdlmm/SDLmm/test/VisualC/rect.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rect.dsp 2001/06/25 23:24:52 1.1 +++ rect.dsp 2001/08/13 01:58:11 1.2 @@ -1,107 +1,107 @@ -# Microsoft Developer Studio Project File - Name="rect" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=rect - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "rect.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "rect.mak" CFG="rect - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "rect - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "rect - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "rect - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\src" /I "E:\Source\SDL-1.2.0\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FD /c -# SUBTRACT CPP /YX -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0xc09 /d "NDEBUG" -# ADD RSC /l 0xc09 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 SDL.lib SDLmain.lib /nologo /subsystem:windows /machine:I386 /libpath:"E:\Source\SDL-1.2.0\VisualC\SDLmain\Output" /libpath:"E:\Source\SDL-1.2.0\VisualC\SDL\Output" - -!ELSEIF "$(CFG)" == "rect - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "rect___Win32_Debug" -# PROP BASE Intermediate_Dir "rect___Win32_Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\src" /I "E:\Source\SDL-1.2.0\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FD /GZ /c -# SUBTRACT CPP /YX -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0xc09 /d "_DEBUG" -# ADD RSC /l 0xc09 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 SDLd.lib SDLmaind.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept /libpath:"E:\Source\SDL-1.2.0\VisualC\SDLmain\Output" /libpath:"E:\Source\SDL-1.2.0\VisualC\SDL\Output" - -!ENDIF - -# Begin Target - -# Name "rect - Win32 Release" -# Name "rect - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\rect.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="rect" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Application" 0x0101 + +CFG=rect - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "rect.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "rect.mak" CFG="rect - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "rect - Win32 Release" (based on "Win32 (x86) Application") +!MESSAGE "rect - Win32 Debug" (based on "Win32 (x86) Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "rect - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\src" /I "E:\Source\SDL-1.2.0\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FD /c +# SUBTRACT CPP /YX +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0xc09 /d "NDEBUG" +# ADD RSC /l 0xc09 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 +# ADD LINK32 SDL.lib SDLmain.lib /nologo /subsystem:windows /machine:I386 /libpath:"E:\Source\SDL-1.2.0\VisualC\Output" + +!ELSEIF "$(CFG)" == "rect - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "rect___Win32_Debug" +# PROP BASE Intermediate_Dir "rect___Win32_Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\src" /I "E:\Source\SDL-1.2.0\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FD /GZ /c +# SUBTRACT CPP /YX +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0xc09 /d "_DEBUG" +# ADD RSC /l 0xc09 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept +# ADD LINK32 SDLd.lib SDLmaind.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept /libpath:"E:\Source\SDL-1.2.0\VisualC\Output" + +!ENDIF + +# Begin Target + +# Name "rect - Win32 Release" +# Name "rect - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=..\rect.cpp +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# End Target +# End Project Index: sprite.dsp =================================================================== RCS file: /cvsroot/sdlmm/SDLmm/test/VisualC/sprite.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sprite.dsp 2001/06/25 23:24:52 1.1 +++ sprite.dsp 2001/08/13 01:58:11 1.2 @@ -1,107 +1,107 @@ -# Microsoft Developer Studio Project File - Name="sprite" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=sprite - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "sprite.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "sprite.mak" CFG="sprite - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "sprite - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "sprite - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "sprite - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\src" /I "E:\Source\SDL-1.2.0\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FD /c -# SUBTRACT CPP /YX -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0xc09 /d "NDEBUG" -# ADD RSC /l 0xc09 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 SDL.lib SDLmain.lib /nologo /subsystem:windows /machine:I386 /libpath:"E:\Source\SDL-1.2.0\VisualC\SDLmain\Output" /libpath:"E:\Source\SDL-1.2.0\VisualC\SDL\Output" - -!ELSEIF "$(CFG)" == "sprite - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "sprite___Win32_Debug" -# PROP BASE Intermediate_Dir "sprite___Win32_Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\src" /I "E:\Source\SDL-1.2.0\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FD /GZ /c -# SUBTRACT CPP /YX -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0xc09 /d "_DEBUG" -# ADD RSC /l 0xc09 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 SDLd.lib SDLmaind.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept /libpath:"E:\Source\SDL-1.2.0\VisualC\SDLmain\Output" /libpath:"E:\Source\SDL-1.2.0\VisualC\SDL\Output" - -!ENDIF - -# Begin Target - -# Name "sprite - Win32 Release" -# Name "sprite - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\sprite.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="sprite" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Application" 0x0101 + +CFG=sprite - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "sprite.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "sprite.mak" CFG="sprite - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "sprite - Win32 Release" (based on "Win32 (x86) Application") +!MESSAGE "sprite - Win32 Debug" (based on "Win32 (x86) Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "sprite - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\src" /I "E:\Source\SDL-1.2.0\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FD /c +# SUBTRACT CPP /YX +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0xc09 /d "NDEBUG" +# ADD RSC /l 0xc09 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 +# ADD LINK32 SDL.lib SDLmain.lib /nologo /subsystem:windows /machine:I386 /libpath:"E:\Source\SDL-1.2.0\VisualC\Output" + +!ELSEIF "$(CFG)" == "sprite - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "sprite___Win32_Debug" +# PROP BASE Intermediate_Dir "sprite___Win32_Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\src" /I "E:\Source\SDL-1.2.0\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FD /GZ /c +# SUBTRACT CPP /YX +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0xc09 /d "_DEBUG" +# ADD RSC /l 0xc09 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept +# ADD LINK32 SDLd.lib SDLmaind.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept /libpath:"E:\Source\SDL-1.2.0\VisualC\Output" + +!ENDIF + +# Begin Target + +# Name "sprite - Win32 Release" +# Name "sprite - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=..\sprite.cpp +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# End Target +# End Project Index: vidinfo.dsp =================================================================== RCS file: /cvsroot/sdlmm/SDLmm/test/VisualC/vidinfo.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- vidinfo.dsp 2001/06/25 23:24:52 1.1 +++ vidinfo.dsp 2001/08/13 01:58:11 1.2 @@ -1,107 +1,108 @@ -# Microsoft Developer Studio Project File - Name="vidinfo" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=vidinfo - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "vidinfo.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "vidinfo.mak" CFG="vidinfo - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "vidinfo - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "vidinfo - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "vidinfo - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\src" /I "E:\Source\SDL-1.2.0\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FD /c -# SUBTRACT CPP /YX -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0xc09 /d "NDEBUG" -# ADD RSC /l 0xc09 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 SDL.lib SDLmain.lib /nologo /subsystem:windows /machine:I386 /libpath:"E:\Source\SDL-1.2.0\VisualC\SDLmain\Output" /libpath:"E:\Source\SDL-1.2.0\VisualC\SDL\Output" - -!ELSEIF "$(CFG)" == "vidinfo - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "vidinfo___Win32_Debug" -# PROP BASE Intermediate_Dir "vidinfo___Win32_Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\src" /I "E:\Source\SDL-1.2.0\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FD /GZ /c -# SUBTRACT CPP /YX -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0xc09 /d "_DEBUG" -# ADD RSC /l 0xc09 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 SDLd.lib SDLmaind.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept /libpath:"E:\Source\SDL-1.2.0\VisualC\SDLmain\Output" /libpath:"E:\Source\SDL-1.2.0\VisualC\SDL\Output" - -!ENDIF - -# Begin Target - -# Name "vidinfo - Win32 Release" -# Name "vidinfo - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\vidinfo.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="vidinfo" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Application" 0x0101 + +CFG=vidinfo - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "vidinfo.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "vidinfo.mak" CFG="vidinfo - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "vidinfo - Win32 Release" (based on "Win32 (x86) Application") +!MESSAGE "vidinfo - Win32 Debug" (based on "Win32 (x86) Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "vidinfo - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\src" /I "E:\Source\SDL-1.2.0\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FD /c +# SUBTRACT CPP /YX +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0xc09 /d "NDEBUG" +# ADD RSC /l 0xc09 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 +# ADD LINK32 SDL.lib SDLmain.lib /nologo /subsystem:windows /machine:I386 /libpath:"E:\Source\SDL-1.2.0\VisualC\Output" + +!ELSEIF "$(CFG)" == "vidinfo - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "vidinfo___Win32_Debug" +# PROP BASE Intermediate_Dir "vidinfo___Win32_Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\src" /I "E:\Source\SDL-1.2.0\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FD /GZ /c +# SUBTRACT CPP /YX +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0xc09 /d "_DEBUG" +# ADD RSC /l 0xc09 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept +# ADD LINK32 SDLd.lib SDLmaind.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept /libpath:"E:\Source\SDL-1.2.0\VisualC\Output" + +!ENDIF + +# Begin Target + +# Name "vidinfo - Win32 Release" +# Name "vidinfo - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=..\vidinfo.cpp +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# End Target +# End Project |
|
From: Adam G. <ra...@us...> - 2001-08-13 01:56:29
|
Update of /cvsroot/sdlmm/SDLmm/src
In directory usw-pr-cvs1:/tmp/cvs-serv22294
Modified Files:
sdlmm_basesurface.h sdlmm_timer.h
Log Message:
More classes to be exported.
Index: sdlmm_basesurface.h
===================================================================
RCS file: /cvsroot/sdlmm/SDLmm/src/sdlmm_basesurface.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sdlmm_basesurface.h 2001/07/16 22:32:44 1.20
+++ sdlmm_basesurface.h 2001/08/13 01:56:26 1.21
@@ -40,7 +40,7 @@
\author David Hedbor <da...@he...>
*/
- class BaseSurface {
+ class DECLSPEC BaseSurface {
protected:
//! The actual SDL_Surface allocated for this BaseSurface.
Index: sdlmm_timer.h
===================================================================
RCS file: /cvsroot/sdlmm/SDLmm/src/sdlmm_timer.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sdlmm_timer.h 2001/07/06 20:30:38 1.6
+++ sdlmm_timer.h 2001/08/13 01:56:26 1.7
@@ -24,7 +24,7 @@
#define SDLMM_TIMER_H
namespace SDLmm {
- class Timer {
+ class DECLSPEC Timer {
public:
typedef unsigned int Ticks;
|
|
From: Adam G. <ra...@us...> - 2001-08-13 01:55:34
|
Update of /cvsroot/sdlmm/SDLmm/VisualC
In directory usw-pr-cvs1:/tmp/cvs-serv22196
Modified Files:
sdlmm.dsp sdlmm.dsw
Added Files:
libsdlmm.dsp
Log Message:
Created a DLL version.
Moved over to use Multithreaded DLL.
--- NEW FILE ---
# Microsoft Developer Studio Project File - Name="libsdlmm" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
CFG=libsdlmm - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "libsdlmm.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "libsdlmm.mak" CFG="libsdlmm - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "libsdlmm - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "libsdlmm - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "libsdlmm - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Output"
# PROP Intermediate_Dir "LibRelease"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
# ADD CPP /nologo /MD /W3 /GX /O2 /I "E:\Source\SDL-1.2.0\include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0xc09 /d "NDEBUG"
# ADD RSC /l 0xc09 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo
!ELSEIF "$(CFG)" == "libsdlmm - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Output"
# PROP Intermediate_Dir "LibDebug"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "E:\Source\SDL-1.2.0\include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /GZ /c
# SUBTRACT CPP /Fr /YX
# ADD BASE RSC /l 0xc09 /d "_DEBUG"
# ADD RSC /l 0xc09 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo /out:"Output\libsdlmmd.lib"
!ENDIF
# Begin Target
# Name "libsdlmm - Win32 Release"
# Name "libsdlmm - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
SOURCE=..\src\sdlmm_audio.cpp
# End Source File
# Begin Source File
SOURCE=..\src\sdlmm_basesurface.cpp
# End Source File
# Begin Source File
SOURCE=..\src\sdlmm_cd.cpp
# End Source File
# Begin Source File
SOURCE=..\src\sdlmm_display.cpp
# End Source File
# Begin Source File
SOURCE=..\src\sdlmm_event.cpp
# End Source File
# Begin Source File
SOURCE=..\src\sdlmm_global.cpp
# End Source File
# Begin Source File
SOURCE=..\src\sdlmm_joystick.cpp
# End Source File
# Begin Source File
SOURCE=..\src\sdlmm_pixelformat.cpp
# End Source File
# Begin Source File
SOURCE=..\src\sdlmm_srect.cpp
# End Source File
# Begin Source File
SOURCE=..\src\sdlmm_surface.cpp
# End Source File
# Begin Source File
SOURCE=..\src\sdlmm_timer.cpp
# End Source File
# Begin Source File
SOURCE=..\src\sdlmm_videoinfo.cpp
# End Source File
# End Group
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
SOURCE=..\src\sdlmm.h
# End Source File
# Begin Source File
SOURCE=..\src\sdlmm_audio.h
# End Source File
# Begin Source File
SOURCE=..\src\sdlmm_basesurface.h
# End Source File
# Begin Source File
SOURCE=..\src\sdlmm_cd.h
# End Source File
# Begin Source File
SOURCE=..\src\sdlmm_color.h
# End Source File
# Begin Source File
SOURCE=..\src\sdlmm_config.h
# End Source File
# Begin Source File
SOURCE=..\src\sdlmm_display.h
# End Source File
# Begin Source File
SOURCE=..\src\sdlmm_event.h
# End Source File
# Begin Source File
SOURCE=..\src\sdlmm_eventhandler.h
# End Source File
# Begin Source File
SOURCE=..\src\sdlmm_global.h
# End Source File
# Begin Source File
SOURCE=..\src\sdlmm_joystick.h
# End Source File
# Begin Source File
SOURCE=..\src\sdlmm_pixelformat.h
# End Source File
# Begin Source File
SOURCE=..\src\sdlmm_spoint.h
# End Source File
# Begin Source File
SOURCE=..\src\sdlmm_srect.h
# End Source File
# Begin Source File
SOURCE=..\src\sdlmm_surface.h
# End Source File
# Begin Source File
SOURCE=..\src\sdlmm_timer.h
# End Source File
# Begin Source File
SOURCE=..\src\sdlmm_videoinfo.h
# End Source File
# End Group
# End Target
# End Project
Index: sdlmm.dsp
===================================================================
RCS file: /cvsroot/sdlmm/SDLmm/VisualC/sdlmm.dsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sdlmm.dsp 2001/08/02 01:35:54 1.4
+++ sdlmm.dsp 2001/08/13 01:55:31 1.5
@@ -2,7 +2,7 @@
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
CFG=sdlmm - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
@@ -17,8 +17,8 @@
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "sdlmm - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "sdlmm - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "sdlmm - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "sdlmm - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
@@ -26,6 +26,7 @@
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
+MTL=midl.exe
RSC=rc.exe
!IF "$(CFG)" == "sdlmm - Win32 Release"
@@ -39,18 +40,21 @@
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Output"
# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "E:\Source\SDL-1.2.0\include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SDLMM_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "E:\Source\SDL-1.2.0\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SDLMM_EXPORTS" /FD /c
# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0xc09 /d "NDEBUG"
# ADD RSC /l 0xc09 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
+# ADD LINK32 sdl.lib /nologo /dll /machine:I386 /libpath:"E:\Source\SDL-1.2.0\VisualC\Output"
!ELSEIF "$(CFG)" == "sdlmm - Win32 Debug"
@@ -63,18 +67,21 @@
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Output"
# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "E:\Source\SDL-1.2.0\include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /GZ /c
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SDLMM_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "E:\Source\SDL-1.2.0\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SDLMM_EXPORTS" /FD /GZ /c
# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0xc09 /d "_DEBUG"
# ADD RSC /l 0xc09 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"Output\sdlmmd.lib"
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 sdld.lib /nologo /dll /debug /machine:I386 /out:"Output/sdlmmd.dll" /pdbtype:sept /libpath:"E:\Source\SDL-1.2.0\VisualC\Output"
!ENDIF
@@ -205,6 +212,10 @@
SOURCE=..\src\sdlmm_videoinfo.h
# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
# End Group
# End Target
# End Project
Index: sdlmm.dsw
===================================================================
RCS file: /cvsroot/sdlmm/SDLmm/VisualC/sdlmm.dsw,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sdlmm.dsw 2001/06/12 03:33:46 1.1
+++ sdlmm.dsw 2001/08/13 01:55:31 1.2
@@ -1,29 +1,41 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "sdlmm"=.\sdlmm.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "sdlmm"=.\sdlmm.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "sdlmmf"=.\libsdlmm.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
|
|
From: David H. <ne...@us...> - 2001-08-07 00:47:39
|
Update of /cvsroot/sdlmm/SDLmm
In directory usw-pr-cvs1:/tmp/cvs-serv26276
Modified Files:
configure.in
Log Message:
Moved SDL check till after all other checks.
Index: configure.in
===================================================================
RCS file: /cvsroot/sdlmm/SDLmm/configure.in,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- configure.in 2001/08/07 00:36:38 1.27
+++ configure.in 2001/08/07 00:47:36 1.28
@@ -63,16 +63,6 @@
AC_CHECK_LIB(m, sqrt)
AC_HEADER_STDC
-AM_PATH_SDL(1.2.0,:, AC_MSG_ERROR([*** SDL version 1.2.0 or newer not found!]))
-AC_MSG_CHECKING(for install prefix)
-if test "$prefix" = "NONE"; then
- prefix=`$SDL_CONFIG --prefix`
-fi
-AC_MSG_RESULT($prefix)
-
-CXXFLAGS="-I$srcdir/src/ $CXXFLAGS $SDL_CFLAGS"
-LIBS="$LIBS $SDL_LIBS"
-
AC_LANG_CPLUSPLUS
AM_PROG_CC_STDC
AC_OPT_FLAGS
@@ -114,6 +104,18 @@
SDLMM_RLD_FLAGS="-R\${exec_prefix}/lib"
;;
esac
+
+AC_LANG_C
+AM_PATH_SDL(1.2.0,:, AC_MSG_ERROR([*** SDL version 1.2.0 or newer not found!]))
+AC_MSG_CHECKING(for install prefix)
+if test "$prefix" = "NONE"; then
+ prefix=`$SDL_CONFIG --prefix`
+fi
+AC_MSG_RESULT($prefix)
+
+CXXFLAGS="-I$srcdir/src/ $CXXFLAGS $SDL_CFLAGS"
+LIBS="$LIBS $SDL_LIBS"
+
if test "$DEBUG" = "yes";then
echo "CXXFLAGS=$CXXFLAGS"
|
|
From: David H. <ne...@us...> - 2001-08-07 00:36:41
|
Update of /cvsroot/sdlmm/SDLmm/src
In directory usw-pr-cvs1:/tmp/cvs-serv20412/src
Modified Files:
sdlmm_display.h sdlmm_event.h sdlmm_eventhandler.h
sdlmm_global.h sdlmm_joystick.h sdlmm_pixelformat.h
sdlmm_spoint.h sdlmm_srect.h sdlmm_surface.h sdlmm_videoinfo.h
Log Message:
+= DECLSPEC and libtool.m4 >> acinclude.m4
Index: sdlmm_display.h
===================================================================
RCS file: /cvsroot/sdlmm/SDLmm/src/sdlmm_display.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sdlmm_display.h 2001/07/06 22:34:05 1.14
+++ sdlmm_display.h 2001/08/07 00:36:38 1.15
@@ -36,7 +36,7 @@
\note Since the actual SDL_Surface representation is shared among all
Display instances, they will always reference the correct surface.
*/
- class Display : public BaseSurface {
+ class DECLSPEC Display : public BaseSurface {
protected:
//! Dummy implementation of operator=() to stop initialization.
Display& operator= (Display&);
Index: sdlmm_event.h
===================================================================
RCS file: /cvsroot/sdlmm/SDLmm/src/sdlmm_event.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sdlmm_event.h 2001/06/12 03:31:05 1.6
+++ sdlmm_event.h 2001/08/07 00:36:38 1.7
@@ -29,7 +29,7 @@
probably the most important class after Surface. The Event class
can be used to store any type of event.
*/
- class Event {
+ class DECLSPEC Event {
public:
//! The event structure.
/*!
Index: sdlmm_eventhandler.h
===================================================================
RCS file: /cvsroot/sdlmm/SDLmm/src/sdlmm_eventhandler.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sdlmm_eventhandler.h 2001/07/23 21:54:07 1.5
+++ sdlmm_eventhandler.h 2001/08/07 00:36:38 1.6
@@ -32,7 +32,7 @@
the events you need to handle.
\sa Event::HandleEvents()
*/
- class EventHandler {
+ class DECLSPEC EventHandler {
public:
virtual ~EventHandler() { }
Index: sdlmm_global.h
===================================================================
RCS file: /cvsroot/sdlmm/SDLmm/src/sdlmm_global.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sdlmm_global.h 2001/04/24 01:46:58 1.12
+++ sdlmm_global.h 2001/08/07 00:36:38 1.13
@@ -40,7 +40,7 @@
that instantiating an object might be enough (for example creating
a VideoInfo instance will initialize the video subsystem).
*/
- bool Init(Uint32 flags);
+ bool DECLSPEC Init(Uint32 flags);
//! Shut down SDL
/*!
@@ -54,7 +54,7 @@
atexit(SDLmm::Quit);
\endcode
*/
- void Quit();
+ void DECLSPEC Quit();
//! Check which subsystems are initialized
/*!
@@ -65,16 +65,16 @@
\returns A bitwised OR'd combination of the initialized
subsystems.
*/
- Uint32 WasInit(Uint32 flags);
+ Uint32 DECLSPEC WasInit(Uint32 flags);
//! Get the latest error message.
/*!
\returns The error message for the last SDL function that failed.
*/
- const char *GetError();
+ const DECLSPEC char *GetError();
//! Return the SDLmm library version.
- const char *version();
+ const DECLSPEC char *version();
}
#endif // SDLMM_GLOBAL_H
Index: sdlmm_joystick.h
===================================================================
RCS file: /cvsroot/sdlmm/SDLmm/src/sdlmm_joystick.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sdlmm_joystick.h 2001/04/21 06:25:36 1.1
+++ sdlmm_joystick.h 2001/08/07 00:36:38 1.2
@@ -24,7 +24,7 @@
#define SDLMM_JOYSTICK_H
namespace SDLmm {
- class Joystick {
+ class DECLSPEC Joystick {
public:
static bool Init();
static void Quit();
Index: sdlmm_pixelformat.h
===================================================================
RCS file: /cvsroot/sdlmm/SDLmm/src/sdlmm_pixelformat.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sdlmm_pixelformat.h 2001/07/05 04:42:08 1.7
+++ sdlmm_pixelformat.h 2001/08/07 00:36:38 1.8
@@ -31,7 +31,7 @@
\author Adam Gates
*/
- class PixelFormat {
+ class DECLSPEC PixelFormat {
protected:
//! The actual SDL_PixelFormat for this PixelFormat.
SDL_PixelFormat *me;
Index: sdlmm_spoint.h
===================================================================
RCS file: /cvsroot/sdlmm/SDLmm/src/sdlmm_spoint.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sdlmm_spoint.h 2001/07/09 01:12:57 1.4
+++ sdlmm_spoint.h 2001/08/07 00:36:38 1.5
@@ -27,7 +27,7 @@
\author Adam Gates
*/
- class SPoint {
+ class DECLSPEC SPoint {
public:
//! Default constructor which creates an empty SPoint (xy variables set
//! to zero).
Index: sdlmm_srect.h
===================================================================
RCS file: /cvsroot/sdlmm/SDLmm/src/sdlmm_srect.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sdlmm_srect.h 2001/07/06 22:37:29 1.16
+++ sdlmm_srect.h 2001/08/07 00:36:38 1.17
@@ -40,7 +40,7 @@
rectangles like intersections.
\author David Hedbor <da...@he...>
*/
- class SRect : public SDL_Rect {
+ class DECLSPEC SRect : public SDL_Rect {
public:
//! Default constructor which creates an empty SRect (xywh variables set
//! to sero).
Index: sdlmm_surface.h
===================================================================
RCS file: /cvsroot/sdlmm/SDLmm/src/sdlmm_surface.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sdlmm_surface.h 2001/07/06 22:34:05 1.23
+++ sdlmm_surface.h 2001/08/07 00:36:38 1.24
@@ -38,7 +38,7 @@
\author David Hedbor <da...@he...>
*/
- class Surface : public BaseSurface
+ class DECLSPEC Surface : public BaseSurface
{
public:
//! Constructor from an SDL_Surface*
Index: sdlmm_videoinfo.h
===================================================================
RCS file: /cvsroot/sdlmm/SDLmm/src/sdlmm_videoinfo.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sdlmm_videoinfo.h 2001/06/12 05:58:51 1.11
+++ sdlmm_videoinfo.h 2001/08/07 00:36:38 1.12
@@ -40,7 +40,7 @@
subsystem must already be initialized.
\sa Display::Init(), Display::SetVideoMode()
*/
- class VideoInfo {
+ class DECLSPEC VideoInfo {
public:
//! The video info struct.
/*!
|
|
From: David H. <ne...@us...> - 2001-08-07 00:36:41
|
Update of /cvsroot/sdlmm/SDLmm
In directory usw-pr-cvs1:/tmp/cvs-serv20412
Modified Files:
acinclude.m4 configure.in
Log Message:
+= DECLSPEC and libtool.m4 >> acinclude.m4
Index: acinclude.m4
===================================================================
RCS file: /cvsroot/sdlmm/SDLmm/acinclude.m4,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- acinclude.m4 2001/06/26 01:20:23 1.6
+++ acinclude.m4 2001/08/07 00:36:38 1.7
@@ -176,3 +176,3400 @@
])
+# libtool.m4 - Configure libtool for the host system. -*-Shell-script-*-
+## Copyright 1996, 1997, 1998, 1999, 2000, 2001
+## Free Software Foundation, Inc.
+## Originally by Gordon Matzigkeit <go...@gn...>, 1996
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
[...3369 lines suppressed...]
+ LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
+ INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+ else
+ ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
+ LIBLTDL="-lltdl"
+ INCLTDL=
+ fi
+])
+
+# old names
+AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL])
+AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
+AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
+AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
+AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
+AC_DEFUN([AM_PROG_LD], [AC_PROG_LD])
+AC_DEFUN([AM_PROG_NM], [AC_PROG_NM])
+
+# This is just to silence aclocal about the macro not being used
+ifelse([AC_DISABLE_FAST_INSTALL])
Index: configure.in
===================================================================
RCS file: /cvsroot/sdlmm/SDLmm/configure.in,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- configure.in 2001/07/23 21:48:12 1.26
+++ configure.in 2001/08/07 00:36:38 1.27
@@ -54,7 +54,7 @@
AC_CANONICAL_TARGET
# Dynamic libs does work right now. Unresolved symbol problem perhaps?
-#AC_LIBTOOL_WIN32_DLL
+AC_LIBTOOL_WIN32_DLL
AM_PROG_LIBTOOL
AM_INIT_AUTOMAKE(SDLmm, $VERSION)
AC_PROG_CXX
|
|
From: Adam G. <ra...@us...> - 2001-08-02 01:35:57
|
Update of /cvsroot/sdlmm/SDLmm/VisualC In directory usw-pr-cvs1:/tmp/cvs-serv12200/VisualC Modified Files: sdlmm.dsp Log Message: Changed to use mt crt static lib rather than dll. Index: sdlmm.dsp =================================================================== RCS file: /cvsroot/sdlmm/SDLmm/VisualC/sdlmm.dsp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sdlmm.dsp 2001/07/09 01:22:24 1.3 +++ sdlmm.dsp 2001/08/02 01:35:54 1.4 @@ -37,11 +37,11 @@ # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" +# PROP Output_Dir "Output" # PROP Intermediate_Dir "Release" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "E:\Source\SDL-1.2.0\include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c +# ADD CPP /nologo /MT /W3 /GX /O2 /I "E:\Source\SDL-1.2.0\include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0xc09 /d "NDEBUG" # ADD RSC /l 0xc09 /d "NDEBUG" @@ -61,11 +61,11 @@ # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" +# PROP Output_Dir "Output" # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "E:\Source\SDL-1.2.0\include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "E:\Source\SDL-1.2.0\include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /GZ /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0xc09 /d "_DEBUG" # ADD RSC /l 0xc09 /d "_DEBUG" @@ -74,7 +74,7 @@ # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo +# ADD LIB32 /nologo /out:"Output\sdlmmd.lib" !ENDIF |
|
From: David H. <ne...@us...> - 2001-07-26 20:11:52
|
Update of /cvsroot/sdlmm/SDLmm In directory usw-pr-cvs1:/tmp/cvs-serv11236 Modified Files: AUTHORS Log Message: Added newline. Index: AUTHORS =================================================================== RCS file: /cvsroot/sdlmm/SDLmm/AUTHORS,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- AUTHORS 2001/07/26 20:10:54 1.4 +++ AUTHORS 2001/07/26 20:11:50 1.5 @@ -7,4 +7,4 @@ Adam Gates <ra...@xo...> (general coding, Win32) -Interested in helping? Contact David. :-) \ No newline at end of file +Interested in helping? Contact David. :-) |
|
From: David H. <ne...@us...> - 2001-07-26 20:10:59
|
Update of /cvsroot/sdlmm/SDLmm In directory usw-pr-cvs1:/tmp/cvs-serv10982 Modified Files: AUTHORS Log Message: Typofix. Index: AUTHORS =================================================================== RCS file: /cvsroot/sdlmm/SDLmm/AUTHORS,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- AUTHORS 2001/07/26 20:10:26 1.3 +++ AUTHORS 2001/07/26 20:10:54 1.4 @@ -7,4 +7,4 @@ Adam Gates <ra...@xo...> (general coding, Win32) -nterested in helping? Contact David. :-) \ No newline at end of file +Interested in helping? Contact David. :-) \ No newline at end of file |
|
From: David H. <ne...@us...> - 2001-07-26 20:10:28
|
Update of /cvsroot/sdlmm/SDLmm/src In directory usw-pr-cvs1:/tmp/cvs-serv10775/src Modified Files: sdlmm.h Log Message: undefine PACKAGE and VERSIOn defines in sdlmm.h to avoid conflicts with other automake packages. Index: sdlmm.h =================================================================== RCS file: /cvsroot/sdlmm/SDLmm/src/sdlmm.h,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sdlmm.h 2001/07/06 20:41:18 1.16 +++ sdlmm.h 2001/07/26 20:10:26 1.17 @@ -114,7 +114,14 @@ #ifndef SDLMM_H #define SDLMM_H #include <SDL.h> +/* The undef kludge is to prevent conflicts with other automake + * packages.. + */ +#undef PACKAGE +#undef VERSION #include "sdlmm_config.h" +#undef PACKAGE +#undef VERSION #include "sdlmm_global.h" #include "sdlmm_spoint.h" #include "sdlmm_srect.h" |
|
From: David H. <ne...@us...> - 2001-07-26 20:10:28
|
Update of /cvsroot/sdlmm/SDLmm In directory usw-pr-cvs1:/tmp/cvs-serv10775 Modified Files: AUTHORS Log Message: undefine PACKAGE and VERSIOn defines in sdlmm.h to avoid conflicts with other automake packages. Index: AUTHORS =================================================================== RCS file: /cvsroot/sdlmm/SDLmm/AUTHORS,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- AUTHORS 2001/07/17 01:13:33 1.2 +++ AUTHORS 2001/07/26 20:10:26 1.3 @@ -4,6 +4,7 @@ Others: - Adam Gates <ra...@xo...> + Adam Gates <ra...@xo...> (general coding, Win32) - Interested in helping? Contact David. :-) \ No newline at end of file + +nterested in helping? Contact David. :-) \ No newline at end of file |
|
From: David H. <ne...@us...> - 2001-07-23 21:54:10
|
Update of /cvsroot/sdlmm/SDLmm/src
In directory usw-pr-cvs1:/tmp/cvs-serv29963
Modified Files:
sdlmm_eventhandler.h
Log Message:
Fixed the name of the destructor. :-)
Index: sdlmm_eventhandler.h
===================================================================
RCS file: /cvsroot/sdlmm/SDLmm/src/sdlmm_eventhandler.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sdlmm_eventhandler.h 2001/07/22 23:29:07 1.4
+++ sdlmm_eventhandler.h 2001/07/23 21:54:07 1.5
@@ -34,7 +34,7 @@
*/
class EventHandler {
public:
- virtual ~HandleKeyboardEvent() { }
+ virtual ~EventHandler() { }
//! \name Keyboard Events
//@{
|
|
From: David H. <ne...@us...> - 2001-07-23 21:50:11
|
Update of /cvsroot/sdlmm/SDLmm In directory usw-pr-cvs1:/tmp/cvs-serv29132 Modified Files: autogen.sh Log Message: Minor tweaking. Index: autogen.sh =================================================================== RCS file: /cvsroot/sdlmm/SDLmm/autogen.sh,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- autogen.sh 2001/06/26 01:20:23 1.8 +++ autogen.sh 2001/07/23 21:50:08 1.9 @@ -4,7 +4,7 @@ aclocal -I . autoheader -automake +automake --no-force --foreign autoconf #./test/autogen.sh |
|
From: David H. <ne...@us...> - 2001-07-23 21:48:15
|
Update of /cvsroot/sdlmm/SDLmm In directory usw-pr-cvs1:/tmp/cvs-serv28649 Modified Files: configure.in Log Message: Version => 0.1.8 Index: configure.in =================================================================== RCS file: /cvsroot/sdlmm/SDLmm/configure.in,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- configure.in 2001/07/06 20:41:18 1.25 +++ configure.in 2001/07/23 21:48:12 1.26 @@ -25,7 +25,7 @@ # MAJOR_VERSION=0 MINOR_VERSION=1 -MICRO_VERSION=7 +MICRO_VERSION=8 INTERFACE_AGE=0 BINARY_AGE=0 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION |