diff --git a/umkMakefile b/umkMakefile index 3133f0503..770152cdf 100644 --- a/umkMakefile +++ b/umkMakefile @@ -64,7 +64,6 @@ prepare: \ $(OutDir_plugin_pcre) $(OutFile): build_info \ - $(OutDir_umk)MacOs.o \ $(OutDir_umk)Console.o \ $(OutDir_umk)IdeContext.o \ $(OutDir_umk)MakeBuild.o \ @@ -82,7 +81,6 @@ $(OutFile): build_info \ $(OutDir_Core)Core.a \ $(OutDir_plugin_pcre)pcre.a $(LINKER) -o "$(OutFile)" -Wl,-s $(LIBPATH) -Wl,-O,2 $(LDFLAGS) -Wl,--start-group \ - $(OutDir_umk)MacOs.o \ $(OutDir_umk)Console.o \ $(OutDir_umk)IdeContext.o \ $(OutDir_umk)MakeBuild.o \ @@ -108,118 +106,6 @@ $(OutFile): build_info \ $(OutDir_umk): mkdir -p $(OutDir_umk) -$(OutDir_umk)MacOs.o: $(UPPDIR1)umk/MacOs.cpp \ - $(UPPDIR1)Core/Algo.h \ - $(UPPDIR1)Core/App.h \ - $(UPPDIR1)Core/AString.hpp \ - $(UPPDIR1)Core/Atomic.h \ - $(UPPDIR1)Core/BiCont.h \ - $(UPPDIR1)Core/Callback.h \ - $(UPPDIR1)Core/CallbackN.i \ - $(UPPDIR1)Core/CallbackNP.i \ - $(UPPDIR1)Core/CallbackR.i \ - $(UPPDIR1)Core/CharSet.h \ - $(UPPDIR1)Core/CharSet.i \ - $(UPPDIR1)Core/CoAlgo.h \ - $(UPPDIR1)Core/Color.h \ - $(UPPDIR1)Core/Complex.h \ - $(UPPDIR1)Core/config.h \ - $(UPPDIR1)Core/Convert.h \ - $(UPPDIR1)Core/Core.h \ - $(UPPDIR1)Core/CoSort.h \ - $(UPPDIR1)Core/CoWork.h \ - $(UPPDIR1)Core/Defs.h \ - $(UPPDIR1)Core/Diag.h \ - $(UPPDIR1)Core/FilterStream.h \ - $(UPPDIR1)Core/FixedMap.h \ - $(UPPDIR1)Core/Fn.h \ - $(UPPDIR1)Core/Format.h \ - $(UPPDIR1)Core/Function.h \ - $(UPPDIR1)Core/Gtypes.h \ - $(UPPDIR1)Core/Hash.h \ - $(UPPDIR1)Core/Heap.h \ - $(UPPDIR1)Core/Huge.h \ - $(UPPDIR1)Core/i18n.h \ - $(UPPDIR1)Core/Index.h \ - $(UPPDIR1)Core/Index.hpp \ - $(UPPDIR1)Core/Inet.h \ - $(UPPDIR1)Core/InMap.hpp \ - $(UPPDIR1)Core/InVector.h \ - $(UPPDIR1)Core/InVector.hpp \ - $(UPPDIR1)Core/JSON.h \ - $(UPPDIR1)Core/Lang.h \ - $(UPPDIR1)Core/Lang_s.h \ - $(UPPDIR1)Core/lib/lz4.h \ - $(UPPDIR1)Core/LocalProcess.h \ - $(UPPDIR1)Core/Map.h \ - $(UPPDIR1)Core/Map.hpp \ - $(UPPDIR1)Core/Mem.h \ - $(UPPDIR1)Core/Mt.h \ - $(UPPDIR1)Core/Obsolete.h \ - $(UPPDIR1)Core/Ops.h \ - $(UPPDIR1)Core/Other.h \ - $(UPPDIR1)Core/Parser.h \ - $(UPPDIR1)Core/Path.h \ - $(UPPDIR1)Core/Profile.h \ - $(UPPDIR1)Core/Ptr.h \ - $(UPPDIR1)Core/Range.h \ - $(UPPDIR1)Core/SIMD_NEON.h \ - $(UPPDIR1)Core/SIMD_SSE2.h \ - $(UPPDIR1)Core/Sort.h \ - $(UPPDIR1)Core/Sorted.h \ - $(UPPDIR1)Core/SplitMerge.h \ - $(UPPDIR1)Core/Stream.h \ - $(UPPDIR1)Core/String.h \ - $(UPPDIR1)Core/t_.h \ - $(UPPDIR1)Core/TimeDate.h \ - $(UPPDIR1)Core/Topic.h \ - $(UPPDIR1)Core/Topt.h \ - $(UPPDIR1)Core/Tuple.h \ - $(UPPDIR1)Core/Utf.hpp \ - $(UPPDIR1)Core/Util.h \ - $(UPPDIR1)Core/Uuid.h \ - $(UPPDIR1)Core/Value.h \ - $(UPPDIR1)Core/Value.hpp \ - $(UPPDIR1)Core/ValueCache.h \ - $(UPPDIR1)Core/ValueUtil.h \ - $(UPPDIR1)Core/ValueUtil.hpp \ - $(UPPDIR1)Core/Vcont.h \ - $(UPPDIR1)Core/Vcont.hpp \ - $(UPPDIR1)Core/Win32Util.h \ - $(UPPDIR1)Core/XML.h \ - $(UPPDIR1)Core/Xmlize.h \ - $(UPPDIR1)Core/Xmlize.hpp \ - $(UPPDIR1)Core/z.h \ - $(UPPDIR1)Draw/Cham.h \ - $(UPPDIR1)Draw/DDARasterizer.h \ - $(UPPDIR1)Draw/Display.h \ - $(UPPDIR1)Draw/Draw.h \ - $(UPPDIR1)Draw/FontInt.h \ - $(UPPDIR1)Draw/Image.h \ - $(UPPDIR1)Draw/ImageOp.h \ - $(UPPDIR1)Draw/Raster.h \ - $(UPPDIR1)Draw/SDraw.h \ - $(UPPDIR1)Draw/SSE2.h \ - $(UPPDIR1)Esc/Esc.h \ - $(UPPDIR1)ide/Builders/Android.h \ - $(UPPDIR1)ide/Builders/Build.h \ - $(UPPDIR1)ide/Builders/BuilderComponents.h \ - $(UPPDIR1)ide/Builders/Builders.h \ - $(UPPDIR1)ide/Core/Core.h \ - $(UPPDIR1)ide/Core/Host.h \ - $(UPPDIR1)ide/Core/Logger.h \ - $(UPPDIR1)plugin/bz2/bz2.h \ - $(UPPDIR1)plugin/bz2/lib/bzlib.h \ - $(UPPDIR1)plugin/lz4/lz4.h \ - $(UPPDIR1)plugin/lzma/lzma.h \ - $(UPPDIR1)plugin/z/lib/zconf.h \ - $(UPPDIR1)plugin/z/lib/zlib.h \ - $(UPPDIR1)plugin/zstd/lib/zstd.h \ - $(UPPDIR1)plugin/zstd/zstd.h \ - $(UPPDIR1)umk/umake.h \ - $(UPPDIR1)uppconfig.h - $(CXX) -c -x c++ $(CXXFLAGS) $(CINC) $(Macro_umk) $(UPPDIR1)umk/MacOs.cpp -o $(OutDir_umk)MacOs.o - $(OutDir_umk)Console.o: $(UPPDIR1)umk/Console.cpp \ $(UPPDIR1)Core/Algo.h \ $(UPPDIR1)Core/App.h \ diff --git a/umkMakefile.in b/umkMakefile.in index 3133f0503..770152cdf 100644 --- a/umkMakefile.in +++ b/umkMakefile.in @@ -64,7 +64,6 @@ prepare: \ $(OutDir_plugin_pcre) $(OutFile): build_info \ - $(OutDir_umk)MacOs.o \ $(OutDir_umk)Console.o \ $(OutDir_umk)IdeContext.o \ $(OutDir_umk)MakeBuild.o \ @@ -82,7 +81,6 @@ $(OutFile): build_info \ $(OutDir_Core)Core.a \ $(OutDir_plugin_pcre)pcre.a $(LINKER) -o "$(OutFile)" -Wl,-s $(LIBPATH) -Wl,-O,2 $(LDFLAGS) -Wl,--start-group \ - $(OutDir_umk)MacOs.o \ $(OutDir_umk)Console.o \ $(OutDir_umk)IdeContext.o \ $(OutDir_umk)MakeBuild.o \ @@ -108,118 +106,6 @@ $(OutFile): build_info \ $(OutDir_umk): mkdir -p $(OutDir_umk) -$(OutDir_umk)MacOs.o: $(UPPDIR1)umk/MacOs.cpp \ - $(UPPDIR1)Core/Algo.h \ - $(UPPDIR1)Core/App.h \ - $(UPPDIR1)Core/AString.hpp \ - $(UPPDIR1)Core/Atomic.h \ - $(UPPDIR1)Core/BiCont.h \ - $(UPPDIR1)Core/Callback.h \ - $(UPPDIR1)Core/CallbackN.i \ - $(UPPDIR1)Core/CallbackNP.i \ - $(UPPDIR1)Core/CallbackR.i \ - $(UPPDIR1)Core/CharSet.h \ - $(UPPDIR1)Core/CharSet.i \ - $(UPPDIR1)Core/CoAlgo.h \ - $(UPPDIR1)Core/Color.h \ - $(UPPDIR1)Core/Complex.h \ - $(UPPDIR1)Core/config.h \ - $(UPPDIR1)Core/Convert.h \ - $(UPPDIR1)Core/Core.h \ - $(UPPDIR1)Core/CoSort.h \ - $(UPPDIR1)Core/CoWork.h \ - $(UPPDIR1)Core/Defs.h \ - $(UPPDIR1)Core/Diag.h \ - $(UPPDIR1)Core/FilterStream.h \ - $(UPPDIR1)Core/FixedMap.h \ - $(UPPDIR1)Core/Fn.h \ - $(UPPDIR1)Core/Format.h \ - $(UPPDIR1)Core/Function.h \ - $(UPPDIR1)Core/Gtypes.h \ - $(UPPDIR1)Core/Hash.h \ - $(UPPDIR1)Core/Heap.h \ - $(UPPDIR1)Core/Huge.h \ - $(UPPDIR1)Core/i18n.h \ - $(UPPDIR1)Core/Index.h \ - $(UPPDIR1)Core/Index.hpp \ - $(UPPDIR1)Core/Inet.h \ - $(UPPDIR1)Core/InMap.hpp \ - $(UPPDIR1)Core/InVector.h \ - $(UPPDIR1)Core/InVector.hpp \ - $(UPPDIR1)Core/JSON.h \ - $(UPPDIR1)Core/Lang.h \ - $(UPPDIR1)Core/Lang_s.h \ - $(UPPDIR1)Core/lib/lz4.h \ - $(UPPDIR1)Core/LocalProcess.h \ - $(UPPDIR1)Core/Map.h \ - $(UPPDIR1)Core/Map.hpp \ - $(UPPDIR1)Core/Mem.h \ - $(UPPDIR1)Core/Mt.h \ - $(UPPDIR1)Core/Obsolete.h \ - $(UPPDIR1)Core/Ops.h \ - $(UPPDIR1)Core/Other.h \ - $(UPPDIR1)Core/Parser.h \ - $(UPPDIR1)Core/Path.h \ - $(UPPDIR1)Core/Profile.h \ - $(UPPDIR1)Core/Ptr.h \ - $(UPPDIR1)Core/Range.h \ - $(UPPDIR1)Core/SIMD_NEON.h \ - $(UPPDIR1)Core/SIMD_SSE2.h \ - $(UPPDIR1)Core/Sort.h \ - $(UPPDIR1)Core/Sorted.h \ - $(UPPDIR1)Core/SplitMerge.h \ - $(UPPDIR1)Core/Stream.h \ - $(UPPDIR1)Core/String.h \ - $(UPPDIR1)Core/t_.h \ - $(UPPDIR1)Core/TimeDate.h \ - $(UPPDIR1)Core/Topic.h \ - $(UPPDIR1)Core/Topt.h \ - $(UPPDIR1)Core/Tuple.h \ - $(UPPDIR1)Core/Utf.hpp \ - $(UPPDIR1)Core/Util.h \ - $(UPPDIR1)Core/Uuid.h \ - $(UPPDIR1)Core/Value.h \ - $(UPPDIR1)Core/Value.hpp \ - $(UPPDIR1)Core/ValueCache.h \ - $(UPPDIR1)Core/ValueUtil.h \ - $(UPPDIR1)Core/ValueUtil.hpp \ - $(UPPDIR1)Core/Vcont.h \ - $(UPPDIR1)Core/Vcont.hpp \ - $(UPPDIR1)Core/Win32Util.h \ - $(UPPDIR1)Core/XML.h \ - $(UPPDIR1)Core/Xmlize.h \ - $(UPPDIR1)Core/Xmlize.hpp \ - $(UPPDIR1)Core/z.h \ - $(UPPDIR1)Draw/Cham.h \ - $(UPPDIR1)Draw/DDARasterizer.h \ - $(UPPDIR1)Draw/Display.h \ - $(UPPDIR1)Draw/Draw.h \ - $(UPPDIR1)Draw/FontInt.h \ - $(UPPDIR1)Draw/Image.h \ - $(UPPDIR1)Draw/ImageOp.h \ - $(UPPDIR1)Draw/Raster.h \ - $(UPPDIR1)Draw/SDraw.h \ - $(UPPDIR1)Draw/SSE2.h \ - $(UPPDIR1)Esc/Esc.h \ - $(UPPDIR1)ide/Builders/Android.h \ - $(UPPDIR1)ide/Builders/Build.h \ - $(UPPDIR1)ide/Builders/BuilderComponents.h \ - $(UPPDIR1)ide/Builders/Builders.h \ - $(UPPDIR1)ide/Core/Core.h \ - $(UPPDIR1)ide/Core/Host.h \ - $(UPPDIR1)ide/Core/Logger.h \ - $(UPPDIR1)plugin/bz2/bz2.h \ - $(UPPDIR1)plugin/bz2/lib/bzlib.h \ - $(UPPDIR1)plugin/lz4/lz4.h \ - $(UPPDIR1)plugin/lzma/lzma.h \ - $(UPPDIR1)plugin/z/lib/zconf.h \ - $(UPPDIR1)plugin/z/lib/zlib.h \ - $(UPPDIR1)plugin/zstd/lib/zstd.h \ - $(UPPDIR1)plugin/zstd/zstd.h \ - $(UPPDIR1)umk/umake.h \ - $(UPPDIR1)uppconfig.h - $(CXX) -c -x c++ $(CXXFLAGS) $(CINC) $(Macro_umk) $(UPPDIR1)umk/MacOs.cpp -o $(OutDir_umk)MacOs.o - $(OutDir_umk)Console.o: $(UPPDIR1)umk/Console.cpp \ $(UPPDIR1)Core/Algo.h \ $(UPPDIR1)Core/App.h \