diff --git a/Makefile.common b/Makefile.common index 9f537da270..d65f6b6821 100644 --- a/Makefile.common +++ b/Makefile.common @@ -382,6 +382,61 @@ OBJ += deps/libui/gtk/alloc.o \ deps/libui/gtk/window.o endif +ifneq ($(findstring Win32,$(OS)),) +OBJ += deps/libui/win32/alloc.o \ + deps/libui/win32/area.o \ + deps/libui/win32/areadraw.o \ + deps/libui/win32/areaevents.o \ + deps/libui/win32/areascroll.o \ + deps/libui/win32/areautil.o \ + deps/libui/win32/box.o \ + deps/libui/win32/button.o \ + deps/libui/win32/checkbox.o \ + deps/libui/win32/colorbutton.o \ + deps/libui/win32/colordialog.o \ + deps/libui/win32/combobox.o \ + deps/libui/win32/container.o \ + deps/libui/win32/control.o \ + deps/libui/win32/d2dscratch.o \ + deps/libui/win32/datetimepicker.o \ + deps/libui/win32/debug.o \ + deps/libui/win32/draw.o \ + deps/libui/win32/drawmatrix.o \ + deps/libui/win32/drawpath.o \ + deps/libui/win32/drawtext.o \ + deps/libui/win32/dwrite.o \ + deps/libui/win32/editablecombo.o \ + deps/libui/win32/entry.o \ + deps/libui/win32/events.o \ + deps/libui/win32/fontbutton.o \ + deps/libui/win32/fontdialog.o \ + deps/libui/win32/form.o \ + deps/libui/win32/graphemes.o \ + deps/libui/win32/grid.o \ + deps/libui/win32/group.o \ + deps/libui/win32/init.o \ + deps/libui/win32/label.o \ + deps/libui/win32/main.o \ + deps/libui/win32/menu.o \ + deps/libui/win32/multilineentry.o \ + deps/libui/win32/parent.o \ + deps/libui/win32/progressbar.o \ + deps/libui/win32/radiobuttons.o \ + deps/libui/win32/separator.o \ + deps/libui/win32/sizing.o \ + deps/libui/win32/slider.o \ + deps/libui/win32/spinbox.o \ + deps/libui/win32/stddialogs.o \ + deps/libui/win32/tab.o \ + deps/libui/win32/tabpage.o \ + deps/libui/win32/text.o \ + deps/libui/win32/utf16.o \ + deps/libui/win32/utilwin.o \ + deps/libui/win32/window.o \ + deps/libui/win32/winpublic.o \ + deps/libui/win32/winutil.o +endif + OBJ += deps/libui/common/areaevents.o \ deps/libui/common/control.o \ deps/libui/common/debug.o \ diff --git a/deps/libui/windows/_uipriv_migrate.hpp b/deps/libui/win32/_uipriv_migrate.hpp similarity index 100% rename from deps/libui/windows/_uipriv_migrate.hpp rename to deps/libui/win32/_uipriv_migrate.hpp diff --git a/deps/libui/windows/alloc.cpp b/deps/libui/win32/alloc.cpp similarity index 100% rename from deps/libui/windows/alloc.cpp rename to deps/libui/win32/alloc.cpp diff --git a/deps/libui/windows/area.cpp b/deps/libui/win32/area.cpp similarity index 100% rename from deps/libui/windows/area.cpp rename to deps/libui/win32/area.cpp diff --git a/deps/libui/windows/area.hpp b/deps/libui/win32/area.hpp similarity index 100% rename from deps/libui/windows/area.hpp rename to deps/libui/win32/area.hpp diff --git a/deps/libui/windows/areadraw.cpp b/deps/libui/win32/areadraw.cpp similarity index 100% rename from deps/libui/windows/areadraw.cpp rename to deps/libui/win32/areadraw.cpp diff --git a/deps/libui/windows/areaevents.cpp b/deps/libui/win32/areaevents.cpp similarity index 100% rename from deps/libui/windows/areaevents.cpp rename to deps/libui/win32/areaevents.cpp diff --git a/deps/libui/windows/areascroll.cpp b/deps/libui/win32/areascroll.cpp similarity index 100% rename from deps/libui/windows/areascroll.cpp rename to deps/libui/win32/areascroll.cpp diff --git a/deps/libui/windows/areautil.cpp b/deps/libui/win32/areautil.cpp similarity index 100% rename from deps/libui/windows/areautil.cpp rename to deps/libui/win32/areautil.cpp diff --git a/deps/libui/windows/box.cpp b/deps/libui/win32/box.cpp similarity index 100% rename from deps/libui/windows/box.cpp rename to deps/libui/win32/box.cpp diff --git a/deps/libui/windows/button.cpp b/deps/libui/win32/button.cpp similarity index 100% rename from deps/libui/windows/button.cpp rename to deps/libui/win32/button.cpp diff --git a/deps/libui/windows/checkbox.cpp b/deps/libui/win32/checkbox.cpp similarity index 100% rename from deps/libui/windows/checkbox.cpp rename to deps/libui/win32/checkbox.cpp diff --git a/deps/libui/windows/colorbutton.cpp b/deps/libui/win32/colorbutton.cpp similarity index 100% rename from deps/libui/windows/colorbutton.cpp rename to deps/libui/win32/colorbutton.cpp diff --git a/deps/libui/windows/colordialog.cpp b/deps/libui/win32/colordialog.cpp similarity index 100% rename from deps/libui/windows/colordialog.cpp rename to deps/libui/win32/colordialog.cpp diff --git a/deps/libui/windows/combobox.cpp b/deps/libui/win32/combobox.cpp similarity index 100% rename from deps/libui/windows/combobox.cpp rename to deps/libui/win32/combobox.cpp diff --git a/deps/libui/windows/compilerver.hpp b/deps/libui/win32/compilerver.hpp similarity index 100% rename from deps/libui/windows/compilerver.hpp rename to deps/libui/win32/compilerver.hpp diff --git a/deps/libui/windows/container.cpp b/deps/libui/win32/container.cpp similarity index 100% rename from deps/libui/windows/container.cpp rename to deps/libui/win32/container.cpp diff --git a/deps/libui/windows/control.cpp b/deps/libui/win32/control.cpp similarity index 100% rename from deps/libui/windows/control.cpp rename to deps/libui/win32/control.cpp diff --git a/deps/libui/windows/d2dscratch.cpp b/deps/libui/win32/d2dscratch.cpp similarity index 100% rename from deps/libui/windows/d2dscratch.cpp rename to deps/libui/win32/d2dscratch.cpp diff --git a/deps/libui/windows/datetimepicker.cpp b/deps/libui/win32/datetimepicker.cpp similarity index 100% rename from deps/libui/windows/datetimepicker.cpp rename to deps/libui/win32/datetimepicker.cpp diff --git a/deps/libui/windows/debug.cpp b/deps/libui/win32/debug.cpp similarity index 100% rename from deps/libui/windows/debug.cpp rename to deps/libui/win32/debug.cpp diff --git a/deps/libui/windows/draw.cpp b/deps/libui/win32/draw.cpp similarity index 100% rename from deps/libui/windows/draw.cpp rename to deps/libui/win32/draw.cpp diff --git a/deps/libui/windows/draw.hpp b/deps/libui/win32/draw.hpp similarity index 100% rename from deps/libui/windows/draw.hpp rename to deps/libui/win32/draw.hpp diff --git a/deps/libui/windows/drawmatrix.cpp b/deps/libui/win32/drawmatrix.cpp similarity index 100% rename from deps/libui/windows/drawmatrix.cpp rename to deps/libui/win32/drawmatrix.cpp diff --git a/deps/libui/windows/drawpath.cpp b/deps/libui/win32/drawpath.cpp similarity index 100% rename from deps/libui/windows/drawpath.cpp rename to deps/libui/win32/drawpath.cpp diff --git a/deps/libui/windows/drawtext.cpp b/deps/libui/win32/drawtext.cpp similarity index 100% rename from deps/libui/windows/drawtext.cpp rename to deps/libui/win32/drawtext.cpp diff --git a/deps/libui/windows/dwrite.cpp b/deps/libui/win32/dwrite.cpp similarity index 100% rename from deps/libui/windows/dwrite.cpp rename to deps/libui/win32/dwrite.cpp diff --git a/deps/libui/windows/editablecombo.cpp b/deps/libui/win32/editablecombo.cpp similarity index 100% rename from deps/libui/windows/editablecombo.cpp rename to deps/libui/win32/editablecombo.cpp diff --git a/deps/libui/windows/entry.cpp b/deps/libui/win32/entry.cpp similarity index 100% rename from deps/libui/windows/entry.cpp rename to deps/libui/win32/entry.cpp diff --git a/deps/libui/windows/events.cpp b/deps/libui/win32/events.cpp similarity index 100% rename from deps/libui/windows/events.cpp rename to deps/libui/win32/events.cpp diff --git a/deps/libui/windows/fontbutton.cpp b/deps/libui/win32/fontbutton.cpp similarity index 100% rename from deps/libui/windows/fontbutton.cpp rename to deps/libui/win32/fontbutton.cpp diff --git a/deps/libui/windows/fontdialog.cpp b/deps/libui/win32/fontdialog.cpp similarity index 100% rename from deps/libui/windows/fontdialog.cpp rename to deps/libui/win32/fontdialog.cpp diff --git a/deps/libui/windows/form.cpp b/deps/libui/win32/form.cpp similarity index 100% rename from deps/libui/windows/form.cpp rename to deps/libui/win32/form.cpp diff --git a/deps/libui/windows/graphemes.cpp b/deps/libui/win32/graphemes.cpp similarity index 100% rename from deps/libui/windows/graphemes.cpp rename to deps/libui/win32/graphemes.cpp diff --git a/deps/libui/windows/grid.cpp b/deps/libui/win32/grid.cpp similarity index 100% rename from deps/libui/windows/grid.cpp rename to deps/libui/win32/grid.cpp diff --git a/deps/libui/windows/group.cpp b/deps/libui/win32/group.cpp similarity index 100% rename from deps/libui/windows/group.cpp rename to deps/libui/win32/group.cpp diff --git a/deps/libui/windows/init.cpp b/deps/libui/win32/init.cpp similarity index 100% rename from deps/libui/windows/init.cpp rename to deps/libui/win32/init.cpp diff --git a/deps/libui/windows/label.cpp b/deps/libui/win32/label.cpp similarity index 100% rename from deps/libui/windows/label.cpp rename to deps/libui/win32/label.cpp diff --git a/deps/libui/windows/libui.manifest b/deps/libui/win32/libui.manifest similarity index 100% rename from deps/libui/windows/libui.manifest rename to deps/libui/win32/libui.manifest diff --git a/deps/libui/windows/main.cpp b/deps/libui/win32/main.cpp similarity index 100% rename from deps/libui/windows/main.cpp rename to deps/libui/win32/main.cpp diff --git a/deps/libui/windows/menu.cpp b/deps/libui/win32/menu.cpp similarity index 100% rename from deps/libui/windows/menu.cpp rename to deps/libui/win32/menu.cpp diff --git a/deps/libui/windows/multilineentry.cpp b/deps/libui/win32/multilineentry.cpp similarity index 100% rename from deps/libui/windows/multilineentry.cpp rename to deps/libui/win32/multilineentry.cpp diff --git a/deps/libui/windows/notes b/deps/libui/win32/notes similarity index 100% rename from deps/libui/windows/notes rename to deps/libui/win32/notes diff --git a/deps/libui/windows/parent.cpp b/deps/libui/win32/parent.cpp similarity index 100% rename from deps/libui/windows/parent.cpp rename to deps/libui/win32/parent.cpp diff --git a/deps/libui/windows/progressbar.cpp b/deps/libui/win32/progressbar.cpp similarity index 100% rename from deps/libui/windows/progressbar.cpp rename to deps/libui/win32/progressbar.cpp diff --git a/deps/libui/windows/radiobuttons.cpp b/deps/libui/win32/radiobuttons.cpp similarity index 100% rename from deps/libui/windows/radiobuttons.cpp rename to deps/libui/win32/radiobuttons.cpp diff --git a/deps/libui/windows/resources.hpp b/deps/libui/win32/resources.hpp similarity index 100% rename from deps/libui/windows/resources.hpp rename to deps/libui/win32/resources.hpp diff --git a/deps/libui/windows/resources.rc b/deps/libui/win32/resources.rc similarity index 100% rename from deps/libui/windows/resources.rc rename to deps/libui/win32/resources.rc diff --git a/deps/libui/windows/separator.cpp b/deps/libui/win32/separator.cpp similarity index 100% rename from deps/libui/windows/separator.cpp rename to deps/libui/win32/separator.cpp diff --git a/deps/libui/windows/sizing.cpp b/deps/libui/win32/sizing.cpp similarity index 100% rename from deps/libui/windows/sizing.cpp rename to deps/libui/win32/sizing.cpp diff --git a/deps/libui/windows/slider.cpp b/deps/libui/win32/slider.cpp similarity index 100% rename from deps/libui/windows/slider.cpp rename to deps/libui/win32/slider.cpp diff --git a/deps/libui/windows/spinbox.cpp b/deps/libui/win32/spinbox.cpp similarity index 100% rename from deps/libui/windows/spinbox.cpp rename to deps/libui/win32/spinbox.cpp diff --git a/deps/libui/windows/stddialogs.cpp b/deps/libui/win32/stddialogs.cpp similarity index 100% rename from deps/libui/windows/stddialogs.cpp rename to deps/libui/win32/stddialogs.cpp diff --git a/deps/libui/windows/tab.cpp b/deps/libui/win32/tab.cpp similarity index 100% rename from deps/libui/windows/tab.cpp rename to deps/libui/win32/tab.cpp diff --git a/deps/libui/windows/tabpage.cpp b/deps/libui/win32/tabpage.cpp similarity index 100% rename from deps/libui/windows/tabpage.cpp rename to deps/libui/win32/tabpage.cpp diff --git a/deps/libui/windows/text.cpp b/deps/libui/win32/text.cpp similarity index 100% rename from deps/libui/windows/text.cpp rename to deps/libui/win32/text.cpp diff --git a/deps/libui/windows/uipriv_windows.hpp b/deps/libui/win32/uipriv_windows.hpp similarity index 100% rename from deps/libui/windows/uipriv_windows.hpp rename to deps/libui/win32/uipriv_windows.hpp diff --git a/deps/libui/windows/utf16.cpp b/deps/libui/win32/utf16.cpp similarity index 100% rename from deps/libui/windows/utf16.cpp rename to deps/libui/win32/utf16.cpp diff --git a/deps/libui/windows/utilwin.cpp b/deps/libui/win32/utilwin.cpp similarity index 100% rename from deps/libui/windows/utilwin.cpp rename to deps/libui/win32/utilwin.cpp diff --git a/deps/libui/windows/winapi.hpp b/deps/libui/win32/winapi.hpp similarity index 100% rename from deps/libui/windows/winapi.hpp rename to deps/libui/win32/winapi.hpp diff --git a/deps/libui/windows/window.cpp b/deps/libui/win32/window.cpp similarity index 100% rename from deps/libui/windows/window.cpp rename to deps/libui/win32/window.cpp diff --git a/deps/libui/windows/winpublic.cpp b/deps/libui/win32/winpublic.cpp similarity index 100% rename from deps/libui/windows/winpublic.cpp rename to deps/libui/win32/winpublic.cpp diff --git a/deps/libui/windows/winutil.cpp b/deps/libui/win32/winutil.cpp similarity index 100% rename from deps/libui/windows/winutil.cpp rename to deps/libui/win32/winutil.cpp