mirror of
https://github.com/ZDoom/Raze.git
synced 2025-02-28 14:11:06 +00:00
git-svn-id: https://svn.eduke32.com/eduke32@602 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
parent
7f4ef87390
commit
bef6dfe7b6
4 changed files with 11 additions and 23 deletions
|
@ -95,11 +95,15 @@ GAMEOBJS=$(OBJ)\game.$o \
|
||||||
$(OBJ)\startwin.game.$o \
|
$(OBJ)\startwin.game.$o \
|
||||||
$(JMACTOBJ) \
|
$(JMACTOBJ) \
|
||||||
$(AUDIOLIBOBJ) \
|
$(AUDIOLIBOBJ) \
|
||||||
|
!ifdef DEBUG
|
||||||
$(OBJ)\mdump.$o
|
$(OBJ)\mdump.$o
|
||||||
|
!endif
|
||||||
|
|
||||||
EDITOROBJS=$(OBJ)\astub.$o \
|
EDITOROBJS=$(OBJ)\astub.$o \
|
||||||
$(OBJ)\buildres.res \
|
$(OBJ)\buildres.res \
|
||||||
|
!ifdef DEBUG
|
||||||
$(OBJ)\mdump.$o
|
$(OBJ)\mdump.$o
|
||||||
|
!endif
|
||||||
|
|
||||||
|
|
||||||
# RULES
|
# RULES
|
||||||
|
|
|
@ -5,32 +5,20 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eduke32", "eduke32.vcproj",
|
||||||
EndProject
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
Classic JFAud|Win32 = Classic JFAud|Win32
|
Classic Debug|Win32 = Classic Debug|Win32
|
||||||
Classic Release JFAud|Win32 = Classic Release JFAud|Win32
|
|
||||||
Classic Release|Win32 = Classic Release|Win32
|
Classic Release|Win32 = Classic Release|Win32
|
||||||
Classic|Win32 = Classic|Win32
|
HRP SD Debug|Win32 = HRP SD Debug|Win32
|
||||||
HRP SD JFAud|Win32 = HRP SD JFAud|Win32
|
|
||||||
HRP SD Release JFAud|Win32 = HRP SD Release JFAud|Win32
|
|
||||||
HRP SD Release|Win32 = HRP SD Release|Win32
|
HRP SD Release|Win32 = HRP SD Release|Win32
|
||||||
HRP SD|Win32 = HRP SD|Win32
|
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||||
{8E7A6179-0B72-4073-8A4C-E8682D481DAE}.Classic JFAud|Win32.ActiveCfg = Classic JFAud|Win32
|
{8E7A6179-0B72-4073-8A4C-E8682D481DAE}.Classic Debug|Win32.ActiveCfg = Classic|Win32
|
||||||
{8E7A6179-0B72-4073-8A4C-E8682D481DAE}.Classic JFAud|Win32.Build.0 = Classic JFAud|Win32
|
{8E7A6179-0B72-4073-8A4C-E8682D481DAE}.Classic Debug|Win32.Build.0 = Classic|Win32
|
||||||
{8E7A6179-0B72-4073-8A4C-E8682D481DAE}.Classic Release JFAud|Win32.ActiveCfg = Classic Release JFAud|Win32
|
|
||||||
{8E7A6179-0B72-4073-8A4C-E8682D481DAE}.Classic Release JFAud|Win32.Build.0 = Classic Release JFAud|Win32
|
|
||||||
{8E7A6179-0B72-4073-8A4C-E8682D481DAE}.Classic Release|Win32.ActiveCfg = Classic Release|Win32
|
{8E7A6179-0B72-4073-8A4C-E8682D481DAE}.Classic Release|Win32.ActiveCfg = Classic Release|Win32
|
||||||
{8E7A6179-0B72-4073-8A4C-E8682D481DAE}.Classic Release|Win32.Build.0 = Classic Release|Win32
|
{8E7A6179-0B72-4073-8A4C-E8682D481DAE}.Classic Release|Win32.Build.0 = Classic Release|Win32
|
||||||
{8E7A6179-0B72-4073-8A4C-E8682D481DAE}.Classic|Win32.ActiveCfg = Classic|Win32
|
{8E7A6179-0B72-4073-8A4C-E8682D481DAE}.HRP SD Debug|Win32.ActiveCfg = HRP SD|Win32
|
||||||
{8E7A6179-0B72-4073-8A4C-E8682D481DAE}.Classic|Win32.Build.0 = Classic|Win32
|
{8E7A6179-0B72-4073-8A4C-E8682D481DAE}.HRP SD Debug|Win32.Build.0 = HRP SD|Win32
|
||||||
{8E7A6179-0B72-4073-8A4C-E8682D481DAE}.HRP SD JFAud|Win32.ActiveCfg = HRP SD JFAud|Win32
|
|
||||||
{8E7A6179-0B72-4073-8A4C-E8682D481DAE}.HRP SD JFAud|Win32.Build.0 = HRP SD JFAud|Win32
|
|
||||||
{8E7A6179-0B72-4073-8A4C-E8682D481DAE}.HRP SD Release JFAud|Win32.ActiveCfg = HRP SD Release JFAud|Win32
|
|
||||||
{8E7A6179-0B72-4073-8A4C-E8682D481DAE}.HRP SD Release JFAud|Win32.Build.0 = HRP SD Release JFAud|Win32
|
|
||||||
{8E7A6179-0B72-4073-8A4C-E8682D481DAE}.HRP SD Release|Win32.ActiveCfg = HRP SD Release|Win32
|
{8E7A6179-0B72-4073-8A4C-E8682D481DAE}.HRP SD Release|Win32.ActiveCfg = HRP SD Release|Win32
|
||||||
{8E7A6179-0B72-4073-8A4C-E8682D481DAE}.HRP SD Release|Win32.Build.0 = HRP SD Release|Win32
|
{8E7A6179-0B72-4073-8A4C-E8682D481DAE}.HRP SD Release|Win32.Build.0 = HRP SD Release|Win32
|
||||||
{8E7A6179-0B72-4073-8A4C-E8682D481DAE}.HRP SD|Win32.ActiveCfg = HRP SD|Win32
|
|
||||||
{8E7A6179-0B72-4073-8A4C-E8682D481DAE}.HRP SD|Win32.Build.0 = HRP SD|Win32
|
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
|
|
|
@ -493,10 +493,6 @@
|
||||||
RelativePath=".\source\grpscan.c"
|
RelativePath=".\source\grpscan.c"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
|
||||||
RelativePath=".\source\jfaud_sounds.cpp"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
<File
|
||||||
RelativePath=".\source\mdump.cpp"
|
RelativePath=".\source\mdump.cpp"
|
||||||
>
|
>
|
||||||
|
|
|
@ -27,7 +27,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
|
|
||||||
#include "osd.h"
|
#include "osd.h"
|
||||||
|
|
||||||
int g_ScriptVersion = 13;
|
int g_ScriptVersion = 13; // 13 = 1.3D-style CON files, 14 = 1.4/1.5 style CON files
|
||||||
|
|
||||||
char compilefile[BMAX_PATH] = "(none)"; // file we're currently compiling
|
char compilefile[BMAX_PATH] = "(none)"; // file we're currently compiling
|
||||||
static char parsing_item_name[MAXVARLABEL] = "(none)", previous_item_name[MAXVARLABEL] = "NULL";
|
static char parsing_item_name[MAXVARLABEL] = "(none)", previous_item_name[MAXVARLABEL] = "NULL";
|
||||||
|
|
Loading…
Reference in a new issue