Commit 338e972f authored by vaclav's avatar vaclav
Browse files

revision of includes in applications files

parent dda6cc15

Workspace_msvc/renderer.vcxproj

+2 −2
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ 
    </Midl>

    <ClCompile>

      <Optimization>Disabled</Optimization>

      <AdditionalIncludeDirectories>..\lib_com;..\lib_dec;..\lib_enc;..\lib_debug;..\lib_util;..\lib_rend;..\lc3plus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_util;..\lib_rend;..\lc3plus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;$(Macros);%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <ExceptionHandling />

      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -180,7 +180,7 @@ 
      <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>

      <OmitFramePointers>false</OmitFramePointers>

      <EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>

      <AdditionalIncludeDirectories>..\lib_com;..\lib_dec;..\lib_enc;..\lib_debug;..\lib_util;..\lib_rend;..\lc3plus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_util;..\lib_rend;..\lc3plus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <StringPooling>true</StringPooling>

      <ExceptionHandling />

apps/decoder.c

+10 −12
Original line number Diff line number Diff line
@@ -30,33 +30,31 @@ 


*******************************************************************************************************/



#include "lib_dec.h"

#include <string.h>

#include <stdlib.h>

#include <assert.h>

#include "lib_dec.h"

#include "cmdl_tools.h"

#include "audio_file_writer.h"

#include "bitstream_reader.h"

#include "masa_file_writer.h"

#include "evs_rtp_payload.h"

#include "ism_file_writer.h"

#include "ls_custom_file_reader.h"

#include "jbm_file_writer.h"

#include "hrtf_file_reader.h"

#include "ls_custom_file_reader.h"

#include "masa_file_writer.h"

#include "render_config_reader.h"

#include "rotation_file_reader.h"

#include "vector3_pair_file_reader.h"

#include "jbm_file_writer.h"

#include "evs_rtp_payload.h"

#ifdef SPLIT_REND_WITH_HEAD_ROT

#include "split_render_file_read_write.h"

#endif

#ifdef VARIABLE_SPEED_DECODING

#include "tsm_scale_file_reader.h"

#endif

#include "vector3_pair_file_reader.h"

#ifdef DEBUGGING

#include "debug.h"

#endif

#include "wmc_auto.h"

#include "render_config_reader.h"

#ifdef SPLIT_REND_WITH_HEAD_ROT

#include "split_render_file_read_write.h"

#endif

#include "hrtf_file_reader.h"





#define WMC_TOOL_SKIP

apps/encoder.c

+3 −4
Original line number Diff line number Diff line
@@ -30,21 +30,20 @@ 


*******************************************************************************************************/



#include <stdio.h>

#include <string.h>

#include <stdlib.h>

#include "lib_enc.h"

#include <string.h>

#include "cmdl_tools.h"

#include "audio_file_reader.h"

#include "bitstream_writer.h"

#include "ism_file_reader.h"

#include "jbm_file_reader.h"

#include "masa_file_reader.h"

#include "ism_file_reader.h"

#ifdef DEBUGGING

#include "debug.h"

#endif

#include "wmc_auto.h"





#define WMC_TOOL_SKIP



/*------------------------------------------------------------------------------------------*

apps/renderer.c

+8 −9
Original line number Diff line number Diff line
@@ -31,34 +31,33 @@ 
*******************************************************************************************************/



#include "lib_rend.h"

#ifdef SPLIT_REND_WITH_HEAD_ROT

#include "split_render_file_read_write.h"

#include "split_rend_bfi_file_reader.h"

#endif

#include <assert.h>

#include <ctype.h>

#include <math.h>

#include <stdbool.h>

#include <stdio.h>

#include <string.h>

#include "audio_file_reader.h"

#include "audio_file_writer.h"

#include "cmdl_tools.h"

#include "cmdln_parser.h"

#include "rotation_file_reader.h"

#include "vector3_pair_file_reader.h"

#include "hrtf_file_reader.h"

#include "ism_file_reader.h"

#include "ls_custom_file_reader.h"

#include "masa_file_reader.h"

#include "masa_file_writer.h"

#include "render_config_reader.h"

#include "rotation_file_reader.h"

#ifdef SPLIT_REND_WITH_HEAD_ROT

#include "split_render_file_read_write.h"

#include "split_rend_bfi_file_reader.h"

#endif

#include "vector3_pair_file_reader.h"

#ifdef DEBUGGING

#include "debug.h"

#endif

#include "wmc_auto.h"





#define WMC_TOOL_SKIP



/*------------------------------------------------------------------------------------------*

 * Local constants

 *------------------------------------------------------------------------------------------*/