Author: j16sdiz Date: 2009-03-31 06:50:04 +0000 (Tue, 31 Mar 2009) New Revision: 26270
Added: trunk/contrib/fec/src/csrc/Makefile.nmake Removed: trunk/contrib/fec/src/csrc/w32 Log: Use standard VC++ nmake file The old version need *both* mingw32 and VC++ Added: trunk/contrib/fec/src/csrc/Makefile.nmake =================================================================== --- trunk/contrib/fec/src/csrc/Makefile.nmake (rev 0) +++ trunk/contrib/fec/src/csrc/Makefile.nmake 2009-03-31 06:50:04 UTC (rev 26270) @@ -0,0 +1,36 @@ +MAKE=nmake -f Makefile.nmake + +CPP=cl.exe + +CPP_OPTS=/nologo /I $(JAVA_HOME)/include /I $(JAVA_HOME)/include/win32 \ + /D WIN32 /D _WINDOWS /D _MBCS /D _USRDLL /D FEC_EXPORTS \ + /D inline=__inline + +CPP_OPTS=/MT /W3 /Ot /D NDEBUG $(CPP_OPTS) + +LIBS=kernel32.lib user32.lib + +LDFLAGS=$(LIBS) /nologo /dll /incremental:no \ + /out:fec$(BITS).dll /implib:fec$(BITS).lib \ + /OPT:REF /MAP + +LD=link.exe + +LDOBJS= fec.obj fec$(BITS)-jinterf.obj + +all: release-all + +feclib: fec$(BITS).dll + +release-all: + $(MAKE) BITS=8 MODE=Release feclib + $(MAKE) BITS=16 MODE=Release feclib + +clean: + del *.dll *.obj *.lib *.pdb *.exp + +fec$(BITS).dll : $(DEF_FILE) $(LDOBJS) + $(LD) $(LDFLAGS) $(LDOBJS) + +.c.obj:: + $(CPP) $(CPP_OPTS) /c $< Deleted: trunk/contrib/fec/src/csrc/w32 =================================================================== --- trunk/contrib/fec/src/csrc/w32 2009-03-31 06:49:52 UTC (rev 26269) +++ trunk/contrib/fec/src/csrc/w32 2009-03-31 06:50:04 UTC (rev 26270) @@ -1,65 +0,0 @@ -MAKE := make -f w32 - -CPP := cl.exe - -MODE ?= Debug - -CPP_OPTS := /nologo /I c:/jdk1.3/include /I c:/jdk1.3/include/win32 \ - /D WIN32 /D _WINDOWS /D _MBCS /D _USRDLL /D FEC_EXPORTS /D inline=__inline - -ifeq ($(MODE),Debug) -Mode := Debug -CPP_OPTS := /nologo /MTd /W3 /GZ /ZI /Od /D DEBUG $(CPP_OPTS) -else -MODE := Release -CPP_OPTS := /nologo /MT /W3 /Ot /D NDEBUG $(CPP_OPTS) -endif - -LIBS := kernel32 user32 #advapi32 shell32 gdi32 winspool cmdlg32 ole32 oleaut32 uuid odbc32 odbccp32 - -LDFLAGS=$(patsubt %,%.lib,$(LIBS)) /nologo /dll /incremental:no \ - /out:$(MODE)/fec$(BITS).dll /implib:$(MODE)/fec$(BITS).lib \ - /OPT:REF /MAP - -LD=link.exe - -LDOBJS= $(MODE)/fec.obj $(MODE)/fec$(BITS)-jinterf.obj - - -.PHONY: all feclib debug-all release-all bits8-all bits16-all clean - -all: debug-all release-all - -feclib: $(MODE)/fec$(BITS).dll - -debug-all: Debug - $(MAKE) BITS=8 MODE=Debug feclib - $(MAKE) BITS=16 MODE=Debug feclib - -release-all: Release - $(MAKE) BITS=8 MODE=Release feclib - $(MAKE) BITS=16 MODE=Release feclib - -bits8-all: Debug Release - $(MAKE) BITS=8 MODE=Debug feclib - $(MAKE) BITS=8 MODE=Release feclib - -bits16-all: Debug Release - $(MAKE) BITS=16 MODE=Debug feclib - $(MAKE) BITS=16 MODE=Release feclib - -clean: - rm -f Debug Release - -Debug: - mkdir -p Debug - -Release: - mkdir -p Release - -$(MODE)/fec$(BITS).dll : $(MODE) $(DEF_FILE) $(LDOBJS) - $(LD) $(LDFLAGS) $(LDOBJS) - - -$(MODE)/%.obj: %.c - $(CPP) $(CPP_OPTS) /c /Fo"$@" $< _______________________________________________ cvs mailing list [email protected] http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
