fixing merge problems

esp-link.vcxproj

@@ -28,7 +28,7 @@
   <PropertyGroup>
     <NMakeOutput />
     <NMakePreprocessorDefinitions>__ets__;_STDINT_H;ICACHE_FLASH;__MINGW32__;__WIN32__</NMakePreprocessorDefinitions>
-    <NMakeIncludeSearchPath>.\cmd;.\serial;.\user;.\espfs;.\httpd;.\include;..\esp_iot_sdk_v1.3.0\include;..\xtensa-lx106-elf\xtensa-lx106-elf\include;c:\tools\mingw64\x86_64-w64-mingw32\include;c:\tools\mingw64\lib\gcc\x86_64-w64-mingw32\4.8.3\include</NMakeIncludeSearchPath>
+    <NMakeIncludeSearchPath>.\cmd;.\serial;.\user;.\espfs;.\httpd;.\include;..\esp_iot_sdk_v1.3.0\include;C:\tools\mingw64\include</NMakeIncludeSearchPath>
     <ExecutablePath />
     <ReferencePath />
     <LibraryPath />

espfs/heatshrink_config_custom.h

@@ -1,30 +0,0 @@
-//Heatshrink config for the decompressor.
-#ifndef HEATSHRINK_CONFIG_H
-#define HEATSHRINK_CONFIG_H
-
-/* Should functionality assuming dynamic allocation be used? */
-#define HEATSHRINK_DYNAMIC_ALLOC 1
-
-#if HEATSHRINK_DYNAMIC_ALLOC
-    /* Optional replacement of malloc/free */
-    #ifdef __ets__
-    #define HEATSHRINK_MALLOC(SZ) os_malloc(SZ)
-    #define HEATSHRINK_FREE(P, SZ) os_free(P)
-    #else
-    #define HEATSHRINK_MALLOC(SZ) malloc(SZ)
-    #define HEATSHRINK_FREE(P, SZ) free(P)
-    #endif
-#else
-    /* Required parameters for static configuration */
-    #define HEATSHRINK_STATIC_INPUT_BUFFER_SIZE 32
-    #define HEATSHRINK_STATIC_WINDOW_BITS 8
-    #define HEATSHRINK_STATIC_LOOKAHEAD_BITS 4
-#endif
-
-/* Turn on logging for debugging. */
-#define HEATSHRINK_DEBUGGING_LOGS 0
-
-/* Use indexing for faster compression. (This requires additional space.) */
-#define HEATSHRINK_USE_INDEX 1
-
-#endif

espfs/heatshrink_decoder.c

@@ -1,19 +0,0 @@
-#include "espfs.h"
-#ifdef ESPFS_HEATSHRINK
-//Stupid wrapper so we don't have to move c-files around
-//Also loads httpd-specific config.
-
-#ifdef __ets__
-//esp build
-
-#include <esp8266.h>
-
-#define memset(x,y,z) os_memset(x,y,z)
-#define memcpy(x,y,z) os_memcpy(x,y,z)
-#endif
-
-#include "heatshrink_config_custom.h"
-#include "../lib/heatshrink/heatshrink_decoder.c"
-
-
-#endif

espfs/mkespfsimage/heatshrink_encoder.c

@@ -1,4 +0,0 @@
-//Stupid wraparound include to make sure object file doesn't end up in heatshrink dir
-#ifdef ESPFS_HEATSHRINK
-#include "../lib/heatshrink/heatshrink_encoder.c"
-#endif