diff --git a/polymer/eduke32/Makefile.msvc b/polymer/eduke32/Makefile.msvc index c470196da..763bedb73 100644 --- a/polymer/eduke32/Makefile.msvc +++ b/polymer/eduke32/Makefile.msvc @@ -95,11 +95,15 @@ GAMEOBJS=$(OBJ)\game.$o \ $(OBJ)\startwin.game.$o \ $(JMACTOBJ) \ $(AUDIOLIBOBJ) \ +!ifdef DEBUG $(OBJ)\mdump.$o +!endif EDITOROBJS=$(OBJ)\astub.$o \ $(OBJ)\buildres.res \ +!ifdef DEBUG $(OBJ)\mdump.$o +!endif # RULES diff --git a/polymer/eduke32/eduke32.sln b/polymer/eduke32/eduke32.sln index a534651dc..8751f0e44 100644 --- a/polymer/eduke32/eduke32.sln +++ b/polymer/eduke32/eduke32.sln @@ -5,32 +5,20 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eduke32", "eduke32.vcproj", EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Classic JFAud|Win32 = Classic JFAud|Win32 - Classic Release JFAud|Win32 = Classic Release JFAud|Win32 + Classic Debug|Win32 = Classic Debug|Win32 Classic Release|Win32 = Classic Release|Win32 - Classic|Win32 = Classic|Win32 - HRP SD JFAud|Win32 = HRP SD JFAud|Win32 - HRP SD Release JFAud|Win32 = HRP SD Release JFAud|Win32 + HRP SD Debug|Win32 = HRP SD Debug|Win32 HRP SD Release|Win32 = HRP SD Release|Win32 - HRP SD|Win32 = HRP SD|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {8E7A6179-0B72-4073-8A4C-E8682D481DAE}.Classic JFAud|Win32.ActiveCfg = Classic JFAud|Win32 - {8E7A6179-0B72-4073-8A4C-E8682D481DAE}.Classic JFAud|Win32.Build.0 = Classic JFAud|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 Debug|Win32.ActiveCfg = Classic|Win32 + {8E7A6179-0B72-4073-8A4C-E8682D481DAE}.Classic Debug|Win32.Build.0 = Classic|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|Win32.ActiveCfg = Classic|Win32 - {8E7A6179-0B72-4073-8A4C-E8682D481DAE}.Classic|Win32.Build.0 = Classic|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 Debug|Win32.ActiveCfg = HRP SD|Win32 + {8E7A6179-0B72-4073-8A4C-E8682D481DAE}.HRP SD Debug|Win32.Build.0 = HRP SD|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|Win32.ActiveCfg = HRP SD|Win32 - {8E7A6179-0B72-4073-8A4C-E8682D481DAE}.HRP SD|Win32.Build.0 = HRP SD|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/polymer/eduke32/eduke32.vcproj b/polymer/eduke32/eduke32.vcproj index 499642d9e..a29bff065 100644 --- a/polymer/eduke32/eduke32.vcproj +++ b/polymer/eduke32/eduke32.vcproj @@ -493,10 +493,6 @@ RelativePath=".\source\grpscan.c" > - - diff --git a/polymer/eduke32/source/gamedef.c b/polymer/eduke32/source/gamedef.c index d7b0b6cb4..0ceea1301 100644 --- a/polymer/eduke32/source/gamedef.c +++ b/polymer/eduke32/source/gamedef.c @@ -27,7 +27,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #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 static char parsing_item_name[MAXVARLABEL] = "(none)", previous_item_name[MAXVARLABEL] = "NULL";