diff --git a/Windows.inc b/Windows.inc deleted file mode 100644 index eaec850b89eb4..0000000000000 --- a/Windows.inc +++ /dev/null @@ -1,65 +0,0 @@ -!ifndef _MAKEFILE_INC_ - -_MAKEFILE_INC_ = 1 - -!if ( "$(TARGET_CPU)" == "X86" ) || ( "$(TARGET_CPU)" == "x86" ) -CPU = i386 -!elseif ( "$(TARGET_CPU)" == "X64" ) || ( "$(TARGET_CPU)" == "x64" ) -CPU = AMD64 -!else -CPU = $(PROCESSOR_ARCHITECTURE) -!endif - -############################################################################### - -!if "$(TARGET_OS)" == "" -TARGET_OS = 5.02 -!endif - -############################################################################### - -!if "$(TARGET_OS)" == "5.0" -WINVER = 0x0500 -!elseif "$(TARGET_OS)" == "5.01" -WINVER = 0x0501 -!elseif "$(TARGET_OS)" == "5.02" -WINVER = 0x0502 -!elseif "$(TARGET_OS)" == "6.0" -WINVER = 0x0600 -!endif - -############################################################################### - -!ifdef INTEL -CC = icl /nologo /Qstd=c99 -LINK = xilink /nologo -AR = xilib /nologo -!else -CC = cl /nologo /TP -LINK = link /nologo -AR = lib /nologo -!endif - -############################################################################### - -CFLAGS = /c /DCRTAPI1=_cdecl /DCRTAPI2=_cdecl /GS /D_WINNT /D_WIN32_WINNT=$(WINVER) /DNTDDI_VERSION=$(WINVER)0000 /DWINVER=$(WINVER) /DWIN32 /D_WIN32 -LFLAGS = /INCREMENTAL:NO /NODEFAULTLIB:MSVCRT - -!if "$(CPU)" == "i386" -CFLAGS = $(CFLAGS) /D_X86_=1 -!elseif "$(CPU)" == "AMD64" -CFLAGS = $(CFLAGS) /D_AMD64_=1 /DWIN64 /D_WIN64 -!endif - -!ifdef JL_DEBUG_BUILD -CFLAGS = $(CFLAGS) /Zi /Od /DDEBUG /MDd -LFLAGS = $(LFLAGS) /DEBUG -!else -CFLAGS = $(CFLAGS) /Ox /DNDEBUG /MD -LFLAGS = $(LFLAGS) /RELEASE -!endif - -!endif # _MAKEFILE_INC_ - -# vim: noexpandtab:ts=4:sw=4:ft=make: - diff --git a/src/Windows.mk b/src/Windows.mk deleted file mode 100644 index 39d252e7039fe..0000000000000 --- a/src/Windows.mk +++ /dev/null @@ -1,128 +0,0 @@ -!INCLUDE <..\Windows.inc> - -.SUFFIXES: .c - -NAME = julia - -HEADERS = \ - builtin_proto.h \ - file_constants.h \ - jltypes_internal.h \ - julia.h \ - newobj_internal.h \ - os_detect.h \ - uv_constants.h - -OBJECTS = \ - jltypes.obj \ - gf.obj \ - ast.obj \ - builtins.obj \ - module.obj \ - codegen.obj \ - interpreter.obj \ - alloc.obj \ - dlload.obj \ - sys.obj \ - init.obj \ - task.obj \ - array.obj \ - dump.obj \ - toplevel.obj \ - jl_uv.obj \ - jlapi.obj \ - llvm-simdloop.obj \ - gc.obj - -LIBFLISP = flisp\libflisp.lib -LIBSUPPORT = support\libsupport.lib -LIBUV = ..\deps\libuv\libuv.lib -FLISP = flisp\flisp.exe - -INCLUDE = $(INCLUDE);$(MAKEDIR)\..\deps\libuv\include;$(MAKEDIR)\flisp;$(MAKEDIR)\support;C:\Program Files\llvm\include -!ifdef JL_DEBUG_BUILD -LIB = $(LIB);C:\Program Files\llvm\lib\Debug -!else -LIB = $(LIB);C:\Program Files\llvm\lib\Release -!endif - -CFLAGS = $(CFLAGS) -D_CRT_SECURE_NO_WARNINGS -CFLAGS = $(CFLAGS) -DJL_SYSTEM_IMAGE_PATH=\"../lib/julia/sys.ji\" -DLIBRARY_EXPORTS - -LIBWINDOWS = \ - kernel32.lib \ - ws2_32.lib \ - psapi.lib \ - advapi32.lib \ - iphlpapi.lib \ - shell32.lib - -LIBLLVM = \ - LLVMAnalysis.lib \ - LLVMArchive.lib \ - LLVMAsmParser.lib \ - LLVMAsmPrinter.lib \ - LLVMBitReader.lib \ - LLVMBitWriter.lib \ - LLVMCodeGen.lib \ - LLVMCore.lib \ - LLVMDebugInfo.lib \ - LLVMExecutionEngine.lib \ - LLVMInstCombine.lib \ - LLVMInstrumentation.lib \ - LLVMInterpreter.lib \ - LLVMipa.lib \ - LLVMipo.lib \ - LLVMJIT.lib \ - LLVMLinker.lib \ - LLVMMC.lib \ - LLVMMCDisassembler.lib \ - LLVMMCJIT.lib \ - LLVMMCParser.lib \ - LLVMObject.lib \ - LLVMRuntimeDyld.lib \ - LLVMScalarOpts.lib \ - LLVMSelectionDAG.lib \ - LLVMSupport.lib \ - LLVMTableGen.lib \ - LLVMTarget.lib \ - LLVMTransformUtils.lib \ - LLVMVectorize.lib \ - LLVMX86AsmParser.lib \ - LLVMX86AsmPrinter.lib \ - LLVMX86CodeGen.lib \ - LLVMX86Desc.lib \ - LLVMX86Disassembler.lib \ - LLVMX86Info.lib \ - LLVMX86Utils.lib - -default: lib$(NAME).dll - -lib$(NAME).dll: $(OBJECTS) flisp\libflisp.lib support\libsupport.lib ..\deps\libuv\libuv.lib - $(LINK) $(LFLAGS) /DLL $(LIBWINDOWS) $(LIBLLVM) /OUT:lib$(NAME).dll $** - -$(FLISP) $(LIBFLISP): - PUSHD flisp && $(MAKE) /NOLOGO /F Windows.mk && POPD - -$(LIBSUPPORT): - PUSHD support && $(MAKE) /NOLOGO /F Windows.mk && POPD - -$(LIBUV): - PUSHD ..\deps\libuv && $(MAKE) /NOLOGO /F Windows.mk && POPD - -ast.obj: julia_flisp.boot.inc flisp\*.h - -julia_flisp.boot.inc: julia_flisp.boot $(FLISP) - .\flisp\flisp .\bin2hex.scm $@ - -julia_flisp.boot: julia-parser.scm julia-syntax.scm match.scm utils.scm jlfrontend.scm mk_julia_flisp_boot.scm $(FLISP) - .\flisp\flisp .\mk_julia_flisp_boot.scm - -.c.obj: - $(CC) $(CFLAGS) $< - -.cpp.obj: - $(CC) $(CFLAGS) $< - -# vim: noexpandtab:ts=4:sw=4: - diff --git a/src/flisp/Windows.mk b/src/flisp/Windows.mk deleted file mode 100644 index 56410473d2d40..0000000000000 --- a/src/flisp/Windows.mk +++ /dev/null @@ -1,65 +0,0 @@ -!INCLUDE <..\..\Windows.inc> - -.SUFFIXES: .c - -NAME = flisp - -SOURCES = \ - builtins.c \ - string.c \ - equalhash.c \ - table.c \ - iostream.c \ - julia_extensions.c - -HEADERS = \ - flisp.h \ - opcodes.h \ - libgen.h - -OBJECTS = \ - flisp.obj \ - builtins.obj \ - string.obj \ - equalhash.obj \ - table.obj \ - iostream.obj \ - julia_extensions.obj - -LIBUV = $(MAKEDIR)\..\..\deps\libuv\libuv.lib -LIBUTF8PROC = $(MAKEDIR)\..\..\deps\libutf8proc\libutf8proc.lib -LIBSUPPORT = $(MAKEDIR)\..\support\libsupport.lib - -INCLUDE = $(INCLUDE);$(MAKEDIR)\..\..\deps\libuv\include;$(MAKEDIR)\..\..\deps\libutf8proc;$(MAKEDIR)\..\support - -CFLAGS = $(CFLAGS) /Qstd=c99 -D_CRT_SECURE_NO_WARNINGS -DLIBRARY_EXPORTS -LFLAGS = $(LFLAGS) kernel32.lib ws2_32.lib psapi.lib advapi32.lib iphlpapi.lib - -default: $(NAME).exe - -$(NAME).exe: lib$(NAME).lib flmain.obj $(LIBSUPPORT) $(LIBUV) $(LIBUTF8PROC) - $(LINK) $(LFLAGS) /OUT:$(NAME).exe /PDB:$(NAME).pdb /MAP $** - -$(LIBSUPPORT): - PUSHD $(MAKEDIR)\..\support && $(MAKE) /NOLOGO /F Windows.mk && POPD - -$(LIBUV): - PUSHD $(MAKEDIR)\..\..\deps\libuv && $(MAKE) /NOLOGO /F Windows.mk && POPD - -$(LIBUTF8PROC): - PUSHD $(MAKEDIR)\..\..\deps\libutf8proc && cl -nologo /c utf8proc.c && $(AR) /OUT:libutf8proc.lib utf8proc.obj && POPD - -lib$(NAME).lib: $(OBJECTS) - $(AR) /OUT:lib$(NAME).lib $** - -flisp.obj: flisp.c cvalues.c types.c flisp.h print.c read.c equal.c - $(CC) $(CFLAGS) flisp.c - -flmain.obj: flmain.c flisp.h - $(CC) $(CFLAGS) flmain.c - -.c.obj: - $(CC) $(CFLAGS) $< - -# vim: noexpandtab:ts=4:sw=4: - diff --git a/src/support/Windows.mk b/src/support/Windows.mk deleted file mode 100644 index 5bfaf9f48f483..0000000000000 --- a/src/support/Windows.mk +++ /dev/null @@ -1,52 +0,0 @@ -!INCLUDE <..\..\Windows.inc> - -.SUFFIXES: .c - -NAME = support - -HEADERS = \ - arraylist.h \ - bitvector.h \ - dirpath.h \ - dtypes.h \ - hashing.h \ - htable.h \ - ios.h \ - libsupport.h \ - MurmurHash3.h \ - ptrhash.h \ - strtod.h \ - timefuncs.h \ - utf8.h \ - utils.h \ - platform.h - -OBJECTS = \ - hashing.obj \ - timefuncs.obj \ - strtod.obj \ - ptrhash.obj \ - operators.obj \ - utf8.obj \ - ios.obj \ - htable.obj \ - bitvector.obj \ - int2str.obj \ - libsupportinit.obj \ - arraylist.obj \ - asprintf.obj \ - dirname.obj - -INCLUDE = $(INCLUDE);$(MAKEDIR)\..\..\deps\libuv\include -CFLAGS = $(CFLAGS) -D_CRT_SECURE_NO_WARNINGS -DLIBRARY_EXPORTS - -default: lib$(NAME).lib - -lib$(NAME).lib: $(OBJECTS) - $(AR) /OUT:$@ $(OBJECTS) - -.c.obj: - $(CC) $(CFLAGS) $< - -# vim: noexpandtab:ts=4:sw=4: -