|
From: Ned K. <ne...@us...> - 2004-09-15 23:13:13
|
Update of /cvsroot/squeak/squeak/platforms/win32/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9433 Modified Files: Tag: ned-branch Makefile.mingw.gcc33 Log Message: More tinkering with build flags Index: Makefile.mingw.gcc33 =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/win32/misc/Attic/Makefile.mingw.gcc33,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** Makefile.mingw.gcc33 16 Jul 2004 17:35:57 -0000 1.1.2.2 --- Makefile.mingw.gcc33 15 Sep 2004 23:13:04 -0000 1.1.2.3 *************** *** 22,26 **** # - # SRCDIR can be set automatically if the current directory is either the # platforms/win32/misc or the platforms/win32 directory --- 22,25 ---- *************** *** 110,114 **** LIBSRC = $(wildcard *.c) ! LIBOBJ = $(LIBSRC:.c=.o) # LIBOBJ = $(addprefix $(OBJDIR)/,$(LIBOBJ)) --- 109,113 ---- LIBSRC = $(wildcard *.c) ! LIBOBJ ?= $(LIBSRC:.c=.o) # LIBOBJ = $(addprefix $(OBJDIR)/,$(LIBOBJ)) *************** *** 151,163 **** # And where to look for files? # ! vpath %.c $(SRCDIR);$(VMDIR);$(VMOUTDIR) ! vpath %.h $(SRCDIR);$(VMDIR);$(VMOUTDIR) - vpath %.o $(BLDDIR) - vpath %.lib $(BLDDIR) vpath Mpeg%.o $(VMOUTDIR) vpath $(VM) $(VMOUTDIR) vpath plugins.% $(SRCDIR)/plugins vpath sqNamedPrims.% $(VMDIR) ############################################################################# --- 150,170 ---- # And where to look for files? # ! vpath %.c $(VMDIR);$(VMOUTDIR) ! vpath %.h $(VMDIR);$(VMOUTDIR) ! ! vpath %.o $(VMOUTDIR) ! vpath %.dll $(BLDDIR) ! ! vpath %.def $(VMOUTDIR) ! vpath %.exp $(VMOUTDIR) ! vpath %.lib $(VMOUTDIR) ! vpath %.res $(VMOUTDIR) vpath Mpeg%.o $(VMOUTDIR) vpath $(VM) $(VMOUTDIR) vpath plugins.% $(SRCDIR)/plugins + vpath sqNamedPrims.% $(VMDIR) + vpath gnu-interp.* $(BLDDIR) ############################################################################# *************** *** 167,188 **** CXX= g++ ! DEFS= -DWIN32_FILE_SUPPORT -DNO_STD_FILE_SUPPORT -DLSB_FIRST -DX86 $(XDEFS) # DEFS= -DWIN32_FILE_SUPPORT -DNO_STD_FILE_SUPPORT -DNDEBUG -DLSB_FIRST -DX86 $(XDEFS) # DEFS= -DMINIMAL -DNDEBUG -DLSB_FIRST -DX86 $(XDEFS) #-DUSE_DIB_SECTIONS #-DPROFILE - XDEFS= -DSQUEAK_BUILTIN_PLUGIN ! INCS= -I. -I$(SRCDIR) -I$(VMDIR) -I$(GNUINCDIR) -I$(DXINCDIR) $(XINC) # INCS= -I. -I$(SRCDIR) -I$(VMDIR) -I$(GNUINCDIR) $(XINC) # WFLAGS= -Wall -Wno-unknown-pragmas ! WFLAGS= ! CPPFLAGS= $(DEFS) $(INCS) ! CFLAGS= -ggdb3 -mwindows -O3 $(WFLAGS) ! INTERPCFLAGS= -fno-gcse ! CXXFLAGS= $(CFLAGS) -felide-constructors ############################################################################# --- 174,200 ---- CXX= g++ ! DEFS ?= -DWIN32_FILE_SUPPORT -DNO_STD_FILE_SUPPORT -DLSB_FIRST -DX86 -DHAVE_LSTAT=0 $(XDEFS) # DEFS= -DWIN32_FILE_SUPPORT -DNO_STD_FILE_SUPPORT -DNDEBUG -DLSB_FIRST -DX86 $(XDEFS) # DEFS= -DMINIMAL -DNDEBUG -DLSB_FIRST -DX86 $(XDEFS) #-DUSE_DIB_SECTIONS #-DPROFILE ! ! XDEFS ?= -DSQUEAK_BUILTIN_PLUGIN ! ! INCS?= -I. -I$(SRCDIR) -I$(VMDIR) -I$(GNUINCDIR) -I$(DXINCDIR) $(XINC) # INCS= -I. -I$(SRCDIR) -I$(VMDIR) -I$(GNUINCDIR) $(XINC) # WFLAGS= -Wall -Wno-unknown-pragmas ! WFLAGS?= ! CPPFLAGS ?= $(DEFS) $(INCS) ! # OPTFLAGS ?= -O3 -fleading-underscore -msse -mmmx -minline-all-stringops ! # OPTFLAGS ?= -O3 -fleading-underscore ! OPTFLAGS ?= -O2 ! CFLAGS ?= -ggdb3 -mwindows -mwin32 -mno-cygwin $(WFLAGS) $(OPTFLAGS) ! INTERPCFLAGS?= -fno-gcse ! CXXFLAGS?= $(CFLAGS) -felide-constructors ############################################################################# *************** *** 194,204 **** # LD= ld LD= gcc - LDFLAGS= -mwindows -ggdb3 --enable-extra-pe-debug --enable-auto-import - # LDFLAGS= DXLIBS= -ldxguid -lddraw -ldinput STDLIBS= -lopengl32 -lwsock32 -lcomdlg32 -lole32 -lwinmm -luser32 -lgdi32 -lkernel32 CRTLIB = -lcrtdll ! LDFLAGS= -L$(GNULIBDIR) -L$(DXLIBDIR) ! LIBS= $(CRTLIB) $(STDLIBS) $(DXLIBS) ############################################################################# --- 206,216 ---- # LD= ld LD= gcc DXLIBS= -ldxguid -lddraw -ldinput STDLIBS= -lopengl32 -lwsock32 -lcomdlg32 -lole32 -lwinmm -luser32 -lgdi32 -lkernel32 CRTLIB = -lcrtdll ! # LDFLAGS= -mwindows -ggdb3 -L$(DXLIBDIR) -L$(GNULIBDIR) ! LDFLAGS= -ggdb3 -L$(DXLIBDIR) -L$(GNULIBDIR) ! LIBS= $(DXLIBS) $(STDLIBS) $(CRTLIB) ! ############################################################################# *************** *** 253,256 **** --- 265,270 ---- # Building plugins + -include pMakefile.win32 + DLL: $(DLLOBJ) *************** *** 269,296 **** -def $(OBJDIR)/$(LIB).def \ -o $(OBJDIR)/$(LIB).dll \ - $(LIBS) \ $(OBJDIR)/$(LIB).exp \ ! $(LIBOBJ) ! -$(RM) -f $(LIBOBJ) $(LIB).lib $(LIB).exp $(LIB).def Mpeg3Plugin.lib: ! @$(MAKE) -C$(DLLDIR)/Mpeg3Plugin -f Makefile.win32 XDEFS=-DSQUEAK_BUILTIN_PLUGIN makelib $(CP) $(DLLDIR)/Mpeg3Plugin/Mpeg3Plugin.lib $(BLDDIR) -$(RM) $(DLLDIR)/Mpeg3Plugin/Mpeg3Plugin.lib Mpeg3Plugin.dll: ! @$(MAKE) -C$(DLLDIR)/Mpeg3Plugin -f Makefile.win32 makedll $(CP) $(DLLDIR)/Mpeg3Plugin/Mpeg3Plugin.dll $(BLDDIR) -$(RM) $(DLLDIR)/Mpeg3Plugin/Mpeg3Plugin.dll %.lib: ! @$(MAKE) -C $(DLLDIR)/$* -f $(THISMAKE) SRCDIR=../../ LIB=$*.lib OBJDIR=. XDEFS=-DSQUEAK_BUILTIN_PLUGIN makelib ! $(CP) $(DLLDIR)/$*/$*.lib $(BLDDIR) ! -$(RM) $(DLLDIR)/$*/$*.lib %.dll: ! @$(MAKE) -C $(DLLDIR)/$* -f $(THISMAKE) SRCDIR=../../ LIB=$* OBJDIR=. XDEFS=-DNIX makedll ! $(CP) $(DLLDIR)/$*/$*.dll $(BLDDIR) ! -$(RM) $(DLLDIR)/$*/$*.dll --- 283,307 ---- -def $(OBJDIR)/$(LIB).def \ -o $(OBJDIR)/$(LIB).dll \ $(OBJDIR)/$(LIB).exp \ ! $(LIBOBJ) \ ! $(LIBS) ! ! # -$(RM) -f $(LIBOBJ) $(LIB).lib $(LIB).exp $(LIB).def Mpeg3Plugin.lib: ! $(MAKE) -C$(DLLDIR)/Mpeg3Plugin -f Makefile.win32 XDEFS=-DSQUEAK_BUILTIN_PLUGIN makelib $(CP) $(DLLDIR)/Mpeg3Plugin/Mpeg3Plugin.lib $(BLDDIR) -$(RM) $(DLLDIR)/Mpeg3Plugin/Mpeg3Plugin.lib Mpeg3Plugin.dll: ! $(MAKE) -C$(DLLDIR)/Mpeg3Plugin -f Makefile.win32 makedll $(CP) $(DLLDIR)/Mpeg3Plugin/Mpeg3Plugin.dll $(BLDDIR) -$(RM) $(DLLDIR)/Mpeg3Plugin/Mpeg3Plugin.dll %.lib: ! $(MAKE) -C $(DLLDIR)/$* -f $(THISMAKE) LIB=$(BLDDIR)/$@ XDEFS=-DSQUEAK_BUILTIN_PLUGIN makelib %.dll: ! $(MAKE) -C $(DLLDIR)/$* -f $(THISMAKE) LIB=$* XDEFS=-DNO_SQUEAK_BUILTIN_PLUGIN makedll *************** *** 337,341 **** gnu-interp.c: interp.c $(MISCDIR)/gnuify ! gnu-interp.o: CFLAGS+=$(INTERPCFLAGS) Mpeg3Plugin.o: Mpeg3Plugin.c --- 348,352 ---- gnu-interp.c: interp.c $(MISCDIR)/gnuify ! gnu-interp.o: CFLAGS?=$(INTERPCFLAGS) Mpeg3Plugin.o: Mpeg3Plugin.c *************** *** 344,347 **** --- 355,359 ---- $(RC) $(RCFLAGS) -i $< -o $@ + ############################################################################# # sync-ing sqNamedPrims.h with plugins.int *************** *** 357,361 **** .PHONY: clean clean: ! -$(RM) -f $(VM) $(EXTERNAL_LIBS) $(ALLOBJ) tags: --- 369,376 ---- .PHONY: clean clean: ! -$(RM) -f $(VM) $(EXTERNAL_LIBS) $(INTERNAL_LIBS) $(LIBOBJ) $(DLLOBJ) $(ALLOBJ) $(DLLDIR)/*/*.o Squeak.* *.o gnu-interp.* $(DLLDIR)/*/*.lib ! ! realclean: clean ! -$(RM) -f tags: |