mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-12-24 10:40:46 +00:00
Misc minor changes
git-svn-id: https://svn.eduke32.com/eduke32@1458 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
parent
1538f39289
commit
3504c0bf97
7 changed files with 363 additions and 438 deletions
|
@ -71,7 +71,7 @@ ifeq (4,$(GCC_MAJOR))
|
|||
endif
|
||||
|
||||
OURCFLAGS=$(debug) -W -Wall -Wimplicit -Werror-implicit-function-declaration \
|
||||
-funsigned-char -fno-strict-aliasing -DNO_GCC_BUILTINS -DNOCOPYPROTECT \
|
||||
-funsigned-char -fno-strict-aliasing -DNO_GCC_BUILTINS \
|
||||
-I$(INC) -I$(EINC) -I$(SRC)/jmact -I$(SRC)/jaudiolib -D_FORTIFY_SOURCE=2 \
|
||||
-fjump-tables -fno-stack-protector
|
||||
# -march=pentium3 -mtune=generic -mmmx -m3dnow -msse -mfpmath=sse
|
||||
|
@ -154,7 +154,6 @@ GAMEOBJS=$(OBJ)/game.$o \
|
|||
$(OBJ)/savegame.$o \
|
||||
$(OBJ)/sector.$o \
|
||||
$(OBJ)/rts.$o \
|
||||
$(OBJ)/testcd.$o \
|
||||
$(OBJ)/osdfuncs.$o \
|
||||
$(OBJ)/osdcmds.$o \
|
||||
$(OBJ)/grpscan.$o \
|
||||
|
|
|
@ -19,7 +19,6 @@ $(OBJ)/sector.$o: $(SRC)/sector.c $(duke3d_h)
|
|||
$(OBJ)/sounds.$o: $(SRC)/sounds.c $(duke3d_h)
|
||||
$(OBJ)/rts.$o: $(SRC)/rts.c $(duke3d_h)
|
||||
$(OBJ)/config.$o: $(SRC)/config.c $(duke3d_h) $(SRC)/jmact/scriplib.h $(INC)/_functio.h
|
||||
$(OBJ)/testcd.$o: $(SRC)/testcd.c
|
||||
$(OBJ)/winbits.$o: $(SRC)/winbits.c
|
||||
$(OBJ)/osdfuncs.$o: $(SRC)/names.h $(EINC)/build.h $(EINC)/osd.h
|
||||
$(OBJ)/osdcmds.$o: $(SRC)/osdcmds.c $(INC)/osdcmds.h $(EINC)/osd.h $(duke3d_h)
|
||||
|
|
|
@ -35,7 +35,7 @@ LINK=link /nologo /opt:ref
|
|||
MT=mt
|
||||
CFLAGS= /MT /J /nologo $(flags_cl) \
|
||||
/I$(INC) /I$(EINC)\ /I$(SRC)\jmact /I$(SRC)\jaudiolib /I$(MSSDKROOT)\include" /I$(PLATFORMSDK)\include" \
|
||||
/DNOCOPYPROTECT /D "_CRT_SECURE_NO_DEPRECATE" /W2 $(ENGINEOPTS) \
|
||||
/D "_CRT_SECURE_NO_DEPRECATE" /W2 $(ENGINEOPTS) \
|
||||
/I$(DXROOT)\include" /DRENDERTYPEWIN=1
|
||||
LIBS=user32.lib gdi32.lib shell32.lib dxguid.lib winmm.lib wsock32.lib comctl32.lib \
|
||||
/NODEFAULTLIB:glu32.lib /NODEFAULTLIB:msvcrt.lib /NODEFAULTLIB:msvcrtd.lib
|
||||
|
@ -93,7 +93,6 @@ GAMEOBJS=$(OBJ)\game.$o \
|
|||
$(OBJ)\rts.$o \
|
||||
$(OBJ)\config.$o \
|
||||
$(OBJ)\animlib.$o\
|
||||
$(OBJ)\testcd.$o \
|
||||
$(OBJ)\osdfuncs.$o \
|
||||
$(OBJ)\osdcmds.$o \
|
||||
$(OBJ)\grpscan.$o \
|
||||
|
|
|
@ -2053,7 +2053,6 @@ void polymer_alt_editorselect(void)
|
|||
if (!s->flags.uptodate)
|
||||
continue;
|
||||
|
||||
|
||||
for (what=1; what<=2; what++)
|
||||
{
|
||||
GLfloat *pl;
|
||||
|
|
|
@ -108,6 +108,10 @@
|
|||
RelativePath=".\build\include\enet_mmulti.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\build\include\fastlz.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\build\include\glbuild.h"
|
||||
>
|
||||
|
@ -124,10 +128,6 @@
|
|||
RelativePath=".\build\include\kplib.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\build\include\fastlz.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\build\include\lzwnew.h"
|
||||
>
|
||||
|
@ -260,6 +260,10 @@
|
|||
RelativePath=".\build\src\engine_priv.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\build\src\fastlz.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\build\src\glbuild.c"
|
||||
>
|
||||
|
@ -276,10 +280,6 @@
|
|||
RelativePath=".\build\src\kplib.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\build\src\fastlz.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\build\src\lzwnew.c"
|
||||
>
|
||||
|
@ -464,10 +464,6 @@
|
|||
RelativePath=".\source\sync.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\source\testcd.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\source\winbits.c"
|
||||
>
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -1,78 +0,0 @@
|
|||
//-------------------------------------------------------------------------
|
||||
/*
|
||||
Duke Nukem Copyright (C) 1996, 2003 3D Realms Entertainment
|
||||
|
||||
This file is part of Duke Nukem 3D version 1.5 - Atomic Edition
|
||||
|
||||
Duke Nukem 3D 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
|
||||
Replacement cd-auth routine by Jonathon Fowler.
|
||||
*/
|
||||
//-------------------------------------------------------------------------
|
||||
|
||||
#if (defined(RENDERTYPEWIN) || defined(WIN32)) && !defined(NOCOPYPROTECT)
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#include <windows.h>
|
||||
#include <fcntl.h>
|
||||
#include <sys/stat.h>
|
||||
#include "compat.h"
|
||||
#include "baselayer.h"
|
||||
|
||||
/*
|
||||
* Why even bother doing this? Because I can. Because it proves the futility
|
||||
* of it all. Because it's amusing. Who cares?
|
||||
*/
|
||||
|
||||
char testcd(char *fn, int32_t testsiz)
|
||||
{
|
||||
DWORD driveletters;
|
||||
int32_t i, fil, dalen;
|
||||
char name[32]="x:\\SUPPORT\\",driv[4]="x:\\";
|
||||
|
||||
strcat(name,fn);
|
||||
|
||||
driveletters = GetLogicalDrives();
|
||||
for (i=2; i<26; i++)
|
||||
{
|
||||
if (!(driveletters & (1ul<<i))) continue;
|
||||
driv[0] = 'A'+i;
|
||||
if (GetDriveType(driv) != DRIVE_CDROM) continue;
|
||||
|
||||
name[0] = 'A'+i;
|
||||
fil = Bopen(name,O_RDONLY,S_IREAD);
|
||||
if (fil<0) continue;
|
||||
dalen = Bfilelength(fil);
|
||||
Bclose(fil);
|
||||
|
||||
if (dalen == testsiz)
|
||||
{
|
||||
initprintf("Copy Protection: Found CDROM in drive %c:\n", driv[0]);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
wm_msgbox("Duke Nukem 3D","Copy Protection: Failed to find CDROM");
|
||||
return 1;
|
||||
}
|
||||
|
||||
#else
|
||||
char testcd(char *fn)
|
||||
{
|
||||
fn = fn;
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
Loading…
Reference in a new issue