WebSVN – Kolibri OS – Path Comparison – /

Regard whitespace Rev 1907 → Rev 1906

 /programs/develop/libraries/newlib/Makefile
 ,7 → 327,7
-shared: $(NAME).dll libamz.a libc.obj
+shared: $(NAME).dll libamz.a
 $(NAME).dll: $(LIB_OBJS) $(SRC_DEP) Makefile
 ,10 → 337,7
 libamz.a: $(AMZ_OBJS) Makefile
         ar rc libamz.a $(AMZ_OBJS)
-libc.obj: $(NAME).dll
-        fasm pe/libc.asm ./libc.obj
 static: $(NAME).a
 $(NAME).a: $(LIB_OBJS) $(SRC_DEP) Makefile

/programs/develop/libraries/newlib/pe/libc.asm
File deleted

 /programs/develop/libraries/newlib/pe/loader.c
 ,7 → 523,7
                         }
                         else if (minn == maxn)
                         {
-                            printf(" unresolved %s\n",imp_name->Name);
+                            printf(" unresolved\n",imp_name->Name);
                             warn=1;
                             break;
                         }

/programs/develop/libraries/newlib/tests/pe_demo.asm
File deleted

 /programs/develop/libraries/cairo/Makefile
 ,7 → 7,7
 LDIMPORT:= -nostdlib --out-implib libcairoimp.a --exclude-libs libamz.a
-LDFLAGS:=  -shared -s -T ../newlib/dll.lds --image-base 0
+LDFLAGS:=  -shared -s -T ../newlib/dll.lds -Map map --image-base 0
 DEFINES = -DHAVE_CONFIG_H -DCAIRO_NO_MUTEX -U_WIN32 -U_MSC_VER -U__WIN32__
 ,8 → 125,6
 %.o : %.c Makefile
         $(CC) $(CFLAGS) $(DEFINES) $(INCLUDES) -o $@ $<
-clean:
-        -rm -f */*.o

 /programs/develop/libraries/libmpg123/Makefile
 ,9 → 4,9
 CFLAGS= -c -combine -O2 -fomit-frame-pointer -ffast-math -mmmx -finline-functions
-LDIMPORT:= -nostdlib --out-implib libmpg123imp.a --exclude-libs libamz.a
+LDIMPORT:= -nostdlib --out-implib libmpg123imp.a
-LDFLAGS:=  -shared -s -T../newlib/dll.lds --image-base 0
+LDFLAGS:=  -shared -s -T../newlib/dll.lds -Map map --image-base 0
 INCLUDES= -I../newlib/include
 ,8 → 61,4
 %.o: %.c Makefile
         $(CC) $(CFLAGS) $(DEFINES) $(INCLUDES) -o $@ $<
-clean:
-        -rm -f *.o

 /programs/develop/libraries/zlib/Makefile
 ,9 → 7,9
 CFLAGS= -O3 -c -fomit-frame-pointer
-LDIMPORT:= -nostdlib --out-implib libzimp.a
+LDIMPORT:= -nostdlib
-LDFLAGS:=  -shared -s -T ../newlib/dll.lds --image-base 0
+LDFLAGS:=  -shared -s -T ../newlib/dll.lds -Map map --image-base 0
 INCLUDES= -I../newlib/include
 ,14 → 30,14
 OBJS = $(OBJC) $(OBJA)
-all: libz.a zlib.dll
+all: libz.a libz.dll
 libz.a: $(OBJS)
         $(AR) $@ $(OBJS)
-zlib.dll: $(OBJECTS) Makefile
-#       dlltool -d zlib.def -Dlibz.dll -e exports.o -l libzimp.a
-        ld $(LDFLAGS) $(LDIMPORT) $(LIBPATH) -o $@ $(OBJS) $(LIBS) zlib.def
+libz.dll: $(OBJECTS) Makefile
+        dlltool -d zlib.def -Dlibz.dll -e exports.o -l libzimp.a
+        ld $(LDFLAGS) $(LDIMPORT) --exclude-all-symbols $(LIBPATH) -o $@ $(OBJS) exports.o $(LIBS)
 %.o: %.c Makefile

 /programs/develop/libraries/Mesa/configs/current
 ,3 → 1,5
+# Autoconf configuration
 #Pull in the defaults
 include $(TOP)/configs/default
 ,7 → 7,6
 CONFIG_NAME = autoconf
 # Compiler and flags
 AR = ar rc
 CC = gcc
 CXX = g++

 /programs/develop/libraries/Mesa/src/mesa/main/context.c
 ,7 → 438,7
    /* Hopefully atexit() is widely available.  If not, we may need some
     * #ifdef tests here.
     */
-   atexit(_mesa_destroy_shader_compiler);
+//   atexit(_mesa_destroy_shader_compiler);
    dummy_enum_func();
 }

/programs/develop/libraries/libpng/symbols.def
File deleted

/programs/develop/libraries/libpng/README
File deleted

 /programs/develop/libraries/libpng/Makefile
 ,11 → 7,11
 CFLAGS = -c -O2 -fomit-frame-pointer
-LDIMPORT:= -nostdlib --out-implib libpngimp.a
+LDIMPORT:= -nostdlib --out-implib libpngimp.a --exclude-libs libamz.a
-LDFLAGS:=  -shared -s -T../newlib/dll.lds --image-base 0
+LDFLAGS:=  -shared -s -T../newlib/dll.lds -Map map --image-base 0
-DEFS = -DHAVE_CONFIG_H
+DEFS = -DHAVE_CONFIG_H -D__DYNAMIC_REENT__
 LIBPNG_DEFINES = -DPNG_CONFIGURE_LIBPNG
 ,6 → 29,7
           pngwtran.c pngwutil.c
 OBJECTS =  $(patsubst %.c, %.o, $(SOURCES))
 ,14 → 43,10
         ar cvrs $(LIBRARY).a $(OBJECTS)
 $(LIBRARY).dll: $(OBJECTS) Makefile
-        ld $(LDFLAGS) $(LDIMPORT) $(LIBPATH) -o $@ $(OBJECTS) $(LIBS) symbols.def
+        ld $(LDFLAGS) $(LDIMPORT) $(LIBPATH) -o $@ $(OBJECTS) $(LIBS)
 %.o : %.c Makefile
         $(CC) $(CFLAGS) $(DEFINES) $(INCLUDES) -o $@ $<
-clean:
-        -rm -f *.o

 /programs/develop/libraries/libpng/pnglibconf.h
 ,7 → 46,7
 #define PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
 #define PNG_USER_LIMITS_SUPPORTED
 #define PNG_FIXED_POINT_SUPPORTED
-#define PNG_ERROR_NUMBERS_SUPPORTED
+/*#undef PNG_ERROR_NUMBERS_SUPPORTED*/
 #define PNG_ERROR_TEXT_SUPPORTED
 #define PNG_READ_SUPPORTED
 /*#undef PNG_READ_16_TO_8_ACCURATE_SCALE_SUPPORTED*/

 /programs/develop/libraries/pixman/Makefile
 ,9 → 6,9
 CFLAGS = -c -O2 -mmmx -Winline -fomit-frame-pointer
 LDIMPORT:= -nostdlib --out-implib libpiximp.a --exclude-libs libamz.a
-LDFLAGS:=  -shared -s -T ../newlib/dll.lds --image-base 0
+LDFLAGS:=  -shared -s -T ../newlib/dll.lds -Map map --image-base 0
-DEFINES = -DHAVE_CONFIG_H -DPIXMAN_NO_TLS -DUSE_MMX
+DEFINES = -DHAVE_CONFIG_H -DPIXMAN_NO_TLS -D__DYNAMIC_REENT__ -DUSE_MMX
 INCLUDES = -I../pixman -I../newlib/include
 ,6 → 61,5
         $(CC) $(CFLAGS) $(DEFINES) $(INCLUDES) -o $@ $<
-clean:
-        -rm -f *.o