diff --git a/.gitignore b/.gitignore index cb455ca..ff13f46 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ bin/ *Darwin.* install_manifest.txt +*.make obj/ *.dis *.o diff --git a/premake/bmath.make b/premake/bmath.make deleted file mode 100644 index 309e901..0000000 --- a/premake/bmath.make +++ /dev/null @@ -1,150 +0,0 @@ -# GNU Make project makefile autogenerated by Premake - -ifndef config - config=debug -endif - -ifndef verbose - SILENT = @ -endif - -.PHONY: clean prebuild prelink - -ifeq ($(config),debug) - RESCOMP = windres - TARGETDIR = ../lib/Debug - TARGET = $(TARGETDIR)/libbmath.so - OBJDIR = ../obj/Debug/bmath - DEFINES += -DDEBUG - INCLUDES += - FORCE_INCLUDE += - ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -fPIC -g - ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -fPIC -g - ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - LIBS += - LDDEPS += - ALL_LDFLAGS += $(LDFLAGS) -shared -Wl,-soname=libbmath.so - LINKCMD = $(CXX) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS) - define PREBUILDCMDS - endef - define PRELINKCMDS - endef - define POSTBUILDCMDS - endef -all: prebuild prelink $(TARGET) - @: - -endif - -ifeq ($(config),release) - RESCOMP = windres - TARGETDIR = ../lib/Release - TARGET = $(TARGETDIR)/libbmath.so - OBJDIR = ../obj/Release/bmath - DEFINES += -DNDEBUG - INCLUDES += - FORCE_INCLUDE += - ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -O2 -fPIC - ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -O2 -fPIC - ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - LIBS += - LDDEPS += - ALL_LDFLAGS += $(LDFLAGS) -shared -Wl,-soname=libbmath.so -s - LINKCMD = $(CXX) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS) - define PREBUILDCMDS - endef - define PRELINKCMDS - endef - define POSTBUILDCMDS - endef -all: prebuild prelink $(TARGET) - @: - -endif - -OBJECTS := \ - $(OBJDIR)/complex.o \ - $(OBJDIR)/math.o \ - $(OBJDIR)/avx2.o \ - $(OBJDIR)/naive.o \ - $(OBJDIR)/sse.o \ - -RESOURCES := \ - -CUSTOMFILES := \ - -SHELLTYPE := posix -ifeq (.exe,$(findstring .exe,$(ComSpec))) - SHELLTYPE := msdos -endif - -$(TARGET): $(GCH) ${CUSTOMFILES} $(OBJECTS) $(LDDEPS) $(RESOURCES) | $(TARGETDIR) - @echo Linking bmath - $(SILENT) $(LINKCMD) - $(POSTBUILDCMDS) - -$(CUSTOMFILES): | $(OBJDIR) - -$(TARGETDIR): - @echo Creating $(TARGETDIR) -ifeq (posix,$(SHELLTYPE)) - $(SILENT) mkdir -p $(TARGETDIR) -else - $(SILENT) mkdir $(subst /,\\,$(TARGETDIR)) -endif - -$(OBJDIR): - @echo Creating $(OBJDIR) -ifeq (posix,$(SHELLTYPE)) - $(SILENT) mkdir -p $(OBJDIR) -else - $(SILENT) mkdir $(subst /,\\,$(OBJDIR)) -endif - -clean: - @echo Cleaning bmath -ifeq (posix,$(SHELLTYPE)) - $(SILENT) rm -f $(TARGET) - $(SILENT) rm -rf $(OBJDIR) -else - $(SILENT) if exist $(subst /,\\,$(TARGET)) del $(subst /,\\,$(TARGET)) - $(SILENT) if exist $(subst /,\\,$(OBJDIR)) rmdir /s /q $(subst /,\\,$(OBJDIR)) -endif - -prebuild: - $(PREBUILDCMDS) - -prelink: - $(PRELINKCMDS) - -ifneq (,$(PCH)) -$(OBJECTS): $(GCH) $(PCH) | $(OBJDIR) -$(GCH): $(PCH) | $(OBJDIR) - @echo $(notdir $<) - $(SILENT) $(CXX) -x c++-header $(ALL_CXXFLAGS) -o "$@" -MF "$(@:%.gch=%.d)" -c "$<" -else -$(OBJECTS): | $(OBJDIR) -endif - -$(OBJDIR)/complex.o: ../src/bmath/complex.cpp - @echo $(notdir $<) - $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<" -$(OBJDIR)/math.o: ../src/bmath/math.cpp - @echo $(notdir $<) - $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<" -$(OBJDIR)/avx2.o: ../src/cpu/avx2.cpp - @echo $(notdir $<) - $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<" -$(OBJDIR)/naive.o: ../src/cpu/naive.cpp - @echo $(notdir $<) - $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<" -$(OBJDIR)/sse.o: ../src/cpu/x86/sse.cpp - @echo $(notdir $<) - $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<" - --include $(OBJECTS:%.o=%.d) -ifneq (,$(PCH)) - -include $(OBJDIR)/$(notdir $(PCH)).d -endif \ No newline at end of file diff --git a/premake/libmath.make b/premake/libmath.make deleted file mode 100644 index 260258b..0000000 --- a/premake/libmath.make +++ /dev/null @@ -1,150 +0,0 @@ -# GNU Make project makefile autogenerated by Premake - -ifndef config - config=debug -endif - -ifndef verbose - SILENT = @ -endif - -.PHONY: clean prebuild prelink - -ifeq ($(config),debug) - RESCOMP = windres - TARGETDIR = ../lib/Debug - TARGET = $(TARGETDIR)/liblibmath.so - OBJDIR = ../obj/Debug/libmath - DEFINES += -DDEBUG - INCLUDES += - FORCE_INCLUDE += - ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -fPIC -g - ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -fPIC -g - ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - LIBS += - LDDEPS += - ALL_LDFLAGS += $(LDFLAGS) -shared -Wl,-soname=liblibmath.so - LINKCMD = $(CXX) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS) - define PREBUILDCMDS - endef - define PRELINKCMDS - endef - define POSTBUILDCMDS - endef -all: prebuild prelink $(TARGET) - @: - -endif - -ifeq ($(config),release) - RESCOMP = windres - TARGETDIR = ../lib/Release - TARGET = $(TARGETDIR)/liblibmath.so - OBJDIR = ../obj/Release/libmath - DEFINES += -DNDEBUG - INCLUDES += - FORCE_INCLUDE += - ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -O2 -fPIC - ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -O2 -fPIC - ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - LIBS += - LDDEPS += - ALL_LDFLAGS += $(LDFLAGS) -shared -Wl,-soname=liblibmath.so -s - LINKCMD = $(CXX) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS) - define PREBUILDCMDS - endef - define PRELINKCMDS - endef - define POSTBUILDCMDS - endef -all: prebuild prelink $(TARGET) - @: - -endif - -OBJECTS := \ - $(OBJDIR)/complex.o \ - $(OBJDIR)/math.o \ - $(OBJDIR)/avx2.o \ - $(OBJDIR)/naive.o \ - $(OBJDIR)/sse.o \ - -RESOURCES := \ - -CUSTOMFILES := \ - -SHELLTYPE := posix -ifeq (.exe,$(findstring .exe,$(ComSpec))) - SHELLTYPE := msdos -endif - -$(TARGET): $(GCH) ${CUSTOMFILES} $(OBJECTS) $(LDDEPS) $(RESOURCES) | $(TARGETDIR) - @echo Linking libmath - $(SILENT) $(LINKCMD) - $(POSTBUILDCMDS) - -$(CUSTOMFILES): | $(OBJDIR) - -$(TARGETDIR): - @echo Creating $(TARGETDIR) -ifeq (posix,$(SHELLTYPE)) - $(SILENT) mkdir -p $(TARGETDIR) -else - $(SILENT) mkdir $(subst /,\\,$(TARGETDIR)) -endif - -$(OBJDIR): - @echo Creating $(OBJDIR) -ifeq (posix,$(SHELLTYPE)) - $(SILENT) mkdir -p $(OBJDIR) -else - $(SILENT) mkdir $(subst /,\\,$(OBJDIR)) -endif - -clean: - @echo Cleaning libmath -ifeq (posix,$(SHELLTYPE)) - $(SILENT) rm -f $(TARGET) - $(SILENT) rm -rf $(OBJDIR) -else - $(SILENT) if exist $(subst /,\\,$(TARGET)) del $(subst /,\\,$(TARGET)) - $(SILENT) if exist $(subst /,\\,$(OBJDIR)) rmdir /s /q $(subst /,\\,$(OBJDIR)) -endif - -prebuild: - $(PREBUILDCMDS) - -prelink: - $(PRELINKCMDS) - -ifneq (,$(PCH)) -$(OBJECTS): $(GCH) $(PCH) | $(OBJDIR) -$(GCH): $(PCH) | $(OBJDIR) - @echo $(notdir $<) - $(SILENT) $(CXX) -x c++-header $(ALL_CXXFLAGS) -o "$@" -MF "$(@:%.gch=%.d)" -c "$<" -else -$(OBJECTS): | $(OBJDIR) -endif - -$(OBJDIR)/complex.o: ../src/bmath/complex.cpp - @echo $(notdir $<) - $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<" -$(OBJDIR)/math.o: ../src/bmath/math.cpp - @echo $(notdir $<) - $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<" -$(OBJDIR)/avx2.o: ../src/cpu/avx2.cpp - @echo $(notdir $<) - $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<" -$(OBJDIR)/naive.o: ../src/cpu/naive.cpp - @echo $(notdir $<) - $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<" -$(OBJDIR)/sse.o: ../src/cpu/sse.cpp - @echo $(notdir $<) - $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<" - --include $(OBJECTS:%.o=%.d) -ifneq (,$(PCH)) - -include $(OBJDIR)/$(notdir $(PCH)).d -endif \ No newline at end of file diff --git a/premake/sse.make b/premake/sse.make deleted file mode 100644 index 3f52e80..0000000 --- a/premake/sse.make +++ /dev/null @@ -1,158 +0,0 @@ -# GNU Make project makefile autogenerated by Premake - -ifndef config - config=debug -endif - -ifndef verbose - SILENT = @ -endif - -.PHONY: clean prebuild prelink - -ifeq ($(config),debug) - RESCOMP = windres - TARGETDIR = ../bin/Debug - TARGET = $(TARGETDIR)/sse - OBJDIR = ../obj/Debug/sse - DEFINES += -DDEBUG - INCLUDES += - FORCE_INCLUDE += - ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -g - ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -g - ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - LIBS += - LDDEPS += - ALL_LDFLAGS += $(LDFLAGS) - LINKCMD = $(CXX) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS) - define PREBUILDCMDS - endef - define PRELINKCMDS - endef - define POSTBUILDCMDS - endef -all: prebuild prelink $(TARGET) - @: - -endif - -ifeq ($(config),release) - RESCOMP = windres - TARGETDIR = ../bin/Release - TARGET = $(TARGETDIR)/sse - OBJDIR = ../obj/Release/sse - DEFINES += -DNDEBUG - INCLUDES += - FORCE_INCLUDE += - ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -O2 - ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -O2 - ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - LIBS += - LDDEPS += - ALL_LDFLAGS += $(LDFLAGS) -s - LINKCMD = $(CXX) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS) - define PREBUILDCMDS - endef - define PRELINKCMDS - endef - define POSTBUILDCMDS - endef -all: prebuild prelink $(TARGET) - @: - -endif - -OBJECTS := \ - $(OBJDIR)/sse.o \ - $(OBJDIR)/complex.o \ - $(OBJDIR)/math.o \ - $(OBJDIR)/avx2.o \ - $(OBJDIR)/naive.o \ - $(OBJDIR)/sse1.o \ - $(OBJDIR)/model.o \ - -RESOURCES := \ - -CUSTOMFILES := \ - -SHELLTYPE := posix -ifeq (.exe,$(findstring .exe,$(ComSpec))) - SHELLTYPE := msdos -endif - -$(TARGET): $(GCH) ${CUSTOMFILES} $(OBJECTS) $(LDDEPS) $(RESOURCES) | $(TARGETDIR) - @echo Linking sse - $(SILENT) $(LINKCMD) - $(POSTBUILDCMDS) - -$(CUSTOMFILES): | $(OBJDIR) - -$(TARGETDIR): - @echo Creating $(TARGETDIR) -ifeq (posix,$(SHELLTYPE)) - $(SILENT) mkdir -p $(TARGETDIR) -else - $(SILENT) mkdir $(subst /,\\,$(TARGETDIR)) -endif - -$(OBJDIR): - @echo Creating $(OBJDIR) -ifeq (posix,$(SHELLTYPE)) - $(SILENT) mkdir -p $(OBJDIR) -else - $(SILENT) mkdir $(subst /,\\,$(OBJDIR)) -endif - -clean: - @echo Cleaning sse -ifeq (posix,$(SHELLTYPE)) - $(SILENT) rm -f $(TARGET) - $(SILENT) rm -rf $(OBJDIR) -else - $(SILENT) if exist $(subst /,\\,$(TARGET)) del $(subst /,\\,$(TARGET)) - $(SILENT) if exist $(subst /,\\,$(OBJDIR)) rmdir /s /q $(subst /,\\,$(OBJDIR)) -endif - -prebuild: - $(PREBUILDCMDS) - -prelink: - $(PRELINKCMDS) - -ifneq (,$(PCH)) -$(OBJECTS): $(GCH) $(PCH) | $(OBJDIR) -$(GCH): $(PCH) | $(OBJDIR) - @echo $(notdir $<) - $(SILENT) $(CXX) -x c++-header $(ALL_CXXFLAGS) -o "$@" -MF "$(@:%.gch=%.d)" -c "$<" -else -$(OBJECTS): | $(OBJDIR) -endif - -$(OBJDIR)/sse.o: ../app/sse.cpp - @echo $(notdir $<) - $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<" -$(OBJDIR)/complex.o: ../src/bmath/complex.cpp - @echo $(notdir $<) - $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<" -$(OBJDIR)/math.o: ../src/bmath/math.cpp - @echo $(notdir $<) - $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<" -$(OBJDIR)/avx2.o: ../src/cpu/avx2.cpp - @echo $(notdir $<) - $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<" -$(OBJDIR)/naive.o: ../src/cpu/naive.cpp - @echo $(notdir $<) - $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<" -$(OBJDIR)/sse1.o: ../src/cpu/x86/sse.cpp - @echo $(notdir $<) - $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<" -$(OBJDIR)/model.o: ../src/misc/memory/model.cpp - @echo $(notdir $<) - $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<" - --include $(OBJECTS:%.o=%.d) -ifneq (,$(PCH)) - -include $(OBJDIR)/$(notdir $(PCH)).d -endif \ No newline at end of file