deps/jpeg: Removed conflicting implementations of memory manager in Makefile / project

- Fixed weird jpeg not opening from associated extensions on Windows 8
- (Was trying to create a temp file in /usr/tmp/ )

diff --git a/deps/jpeg-6b/Makefile b/deps/jpeg-6b/Makefile
index 2c9dabb..cd25484 100644 (file)
--- a/deps/jpeg-6b/Makefile
+++ b/deps/jpeg-6b/Makefile
@@ -87,9 +87,7 @@ _OBJECTS2 = \
        $(OBJ)jidctfst.o \
        $(OBJ)jidctint.o \
        $(OBJ)jidctred.o \
-       $(OBJ)jmemansi.o \
        $(OBJ)jmemmgr.o \
-       $(OBJ)jmemname.o \
        $(OBJ)jmemnobs.o \
        $(OBJ)jquant1.o \
        $(OBJ)jquant2.o \
@@ -140,9 +138,7 @@ SOURCES = \
        jidctfst.c \
        jidctint.c \
        jidctred.c \
-       jmemansi.c \
        jmemmgr.c \
-       jmemname.c \
        jmemnobs.c \
        jquant1.c \
        jquant2.c \
@@ -305,15 +301,9 @@ $(OBJ)jidctint.o: jidctint.c
 $(OBJ)jidctred.o: jidctred.c
        $(CC) $(CFLAGS) $(PRJ_CFLAGS) -c jidctred.c -o $(OBJ)jidctred.o
 
-$(OBJ)jmemansi.o: jmemansi.c
-       $(CC) $(CFLAGS) $(PRJ_CFLAGS) -c jmemansi.c -o $(OBJ)jmemansi.o
-
 $(OBJ)jmemmgr.o: jmemmgr.c
        $(CC) $(CFLAGS) $(PRJ_CFLAGS) -c jmemmgr.c -o $(OBJ)jmemmgr.o
 
-$(OBJ)jmemname.o: jmemname.c
-       $(CC) $(CFLAGS) $(PRJ_CFLAGS) -c jmemname.c -o $(OBJ)jmemname.o
-
 $(OBJ)jmemnobs.o: jmemnobs.c
        $(CC) $(CFLAGS) $(PRJ_CFLAGS) -c jmemnobs.c -o $(OBJ)jmemnobs.o
 

diff --git a/deps/jpeg-6b/jpeg.epj b/deps/jpeg-6b/jpeg.epj
index c6f6aa6..2d41592 100644 (file)
--- a/deps/jpeg-6b/jpeg.epj
+++ b/deps/jpeg-6b/jpeg.epj
@@ -87,14 +87,12 @@
       "jidctfst.c",
       "jidctint.c",
       "jidctred.c",
-      "jmemansi.c",
-      "jmemmgr.c",
-      "jmemname.c",
-      "jmemnobs.c",
       "jquant1.c",
       "jquant2.c",
       "jutils.c",
-      "transupp.c"
+      "transupp.c",
+      "jmemmgr.c",
+      "jmemnobs.c"
    ],
    "ResourcesPath" : "",
    "Resources" : [