From d9500e18e04209ee4f5e0436611f57399dd003ec Mon Sep 17 00:00:00 2001 From: terminx Date: Tue, 1 Apr 2008 22:28:42 +0000 Subject: [PATCH] git-svn-id: https://svn.eduke32.com/eduke32@681 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/build/include/glbuild.h | 2 ++ polymer/build/src/winlayer.c | 4 ++-- polymer/eduke32/source/jaudiolib/openal.c | 22 ++++++++++++++++++++++ polymer/eduke32/source/jaudiolib/openal.h | 22 ++++++++++++++++++++++ 4 files changed, 48 insertions(+), 2 deletions(-) diff --git a/polymer/build/include/glbuild.h b/polymer/build/include/glbuild.h index b0d3fcf53..544826310 100644 --- a/polymer/build/include/glbuild.h +++ b/polymer/build/include/glbuild.h @@ -18,6 +18,8 @@ //#include #if defined(__APPLE__) # include +#elif defined(_MSC_VER) +# include "glext.h" #else # include "GL/glext.h" #endif diff --git a/polymer/build/src/winlayer.c b/polymer/build/src/winlayer.c index 2830918dd..acc0ac84a 100644 --- a/polymer/build/src/winlayer.c +++ b/polymer/build/src/winlayer.c @@ -2430,8 +2430,6 @@ int setpalette(int start, int num, char *dapal) RGBQUAD *rgb; //HPALETTE hPalPrev; - UNREFERENCED_PARAMETER(dapal); - struct logpal { WORD palVersion; @@ -2439,6 +2437,8 @@ int setpalette(int start, int num, char *dapal) PALETTEENTRY palPalEntry[256]; } lpal; + UNREFERENCED_PARAMETER(dapal); + copybuf(curpalettefaded, lpal.palPalEntry, 256); for (i=start, n=num; n>0; i++, n--) diff --git a/polymer/eduke32/source/jaudiolib/openal.c b/polymer/eduke32/source/jaudiolib/openal.c index 58ebaff55..983fbdef4 100644 --- a/polymer/eduke32/source/jaudiolib/openal.c +++ b/polymer/eduke32/source/jaudiolib/openal.c @@ -1,3 +1,25 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2008 - EDuke32 developers + +This file is part of EDuke32 + +EDuke32 is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License version 2 +as published by the Free Software Foundation. + +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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*/ +//------------------------------------------------------------------------- + #ifdef _WIN32 #include "dsound.h" #endif diff --git a/polymer/eduke32/source/jaudiolib/openal.h b/polymer/eduke32/source/jaudiolib/openal.h index 1b940faa7..bad1d8a23 100644 --- a/polymer/eduke32/source/jaudiolib/openal.h +++ b/polymer/eduke32/source/jaudiolib/openal.h @@ -1,3 +1,25 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2008 - EDuke32 developers + +This file is part of EDuke32 + +EDuke32 is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License version 2 +as published by the Free Software Foundation. + +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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*/ +//------------------------------------------------------------------------- + #ifndef __OPENAL_H #define __OPENAL_H