Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rebaked D2D additions.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77568 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
2014-09-10 05:54:33 +00:00
parent bba268b379
commit 3ade92601d
6 changed files with 115 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
build/msw/makefile.bcc
View File

@@ -1807,6 +1807,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_utilswin.obj \
$(OBJS)\monodll_uxtheme.obj \
$(OBJS)\monodll_window.obj \
$(OBJS)\monodll_graphicsd2d.obj \
$(OBJS)\monodll_helpchm.obj \
$(OBJS)\monodll_helpwin.obj \
$(OBJS)\monodll_automtn.obj \
@@ -2088,6 +2089,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_utilswin.obj \
$(OBJS)\monodll_uxtheme.obj \
$(OBJS)\monodll_window.obj \
$(OBJS)\monodll_graphicsd2d.obj \
$(OBJS)\monodll_helpchm.obj \
$(OBJS)\monodll_helpwin.obj \
$(OBJS)\monodll_automtn.obj \
@@ -2615,6 +2617,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_utilswin.obj \
$(OBJS)\monolib_uxtheme.obj \
$(OBJS)\monolib_window.obj \
$(OBJS)\monolib_graphicsd2d.obj \
$(OBJS)\monolib_helpchm.obj \
$(OBJS)\monolib_helpwin.obj \
$(OBJS)\monolib_automtn.obj \
@@ -2896,6 +2899,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_utilswin.obj \
$(OBJS)\monolib_uxtheme.obj \
$(OBJS)\monolib_window.obj \
$(OBJS)\monolib_graphicsd2d.obj \
$(OBJS)\monolib_helpchm.obj \
$(OBJS)\monolib_helpwin.obj \
$(OBJS)\monolib_automtn.obj \
@@ -3299,6 +3303,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_utilswin.obj \
$(OBJS)\coredll_uxtheme.obj \
$(OBJS)\coredll_window.obj \
$(OBJS)\coredll_graphicsd2d.obj \
$(OBJS)\coredll_helpchm.obj \
$(OBJS)\coredll_helpwin.obj \
$(OBJS)\coredll_automtn.obj \
@@ -3580,6 +3585,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_utilswin.obj \
$(OBJS)\coredll_uxtheme.obj \
$(OBJS)\coredll_window.obj \
$(OBJS)\coredll_graphicsd2d.obj \
$(OBJS)\coredll_helpchm.obj \
$(OBJS)\coredll_helpwin.obj \
$(OBJS)\coredll_automtn.obj \
@@ -3859,6 +3865,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_utilswin.obj \
$(OBJS)\corelib_uxtheme.obj \
$(OBJS)\corelib_window.obj \
$(OBJS)\corelib_graphicsd2d.obj \
$(OBJS)\corelib_helpchm.obj \
$(OBJS)\corelib_helpwin.obj \
$(OBJS)\corelib_automtn.obj \
@@ -4140,6 +4147,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_utilswin.obj \
$(OBJS)\corelib_uxtheme.obj \
$(OBJS)\corelib_window.obj \
$(OBJS)\corelib_graphicsd2d.obj \
$(OBJS)\corelib_helpchm.obj \
$(OBJS)\corelib_helpwin.obj \
$(OBJS)\corelib_automtn.obj \
@@ -7643,6 +7651,11 @@ $(OBJS)\monodll_window.obj: ..\..\src\msw\window.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\window.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_graphicsd2d.obj: ..\..\src\msw\graphicsd2d.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\graphicsd2d.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_helpchm.obj: ..\..\src\msw\helpchm.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\helpchm.cpp
@@ -10114,6 +10127,11 @@ $(OBJS)\monolib_window.obj: ..\..\src\msw\window.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\window.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_graphicsd2d.obj: ..\..\src\msw\graphicsd2d.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\graphicsd2d.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_helpchm.obj: ..\..\src\msw\helpchm.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\helpchm.cpp
@@ -12531,6 +12549,11 @@ $(OBJS)\coredll_window.obj: ..\..\src\msw\window.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\window.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_graphicsd2d.obj: ..\..\src\msw\graphicsd2d.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\graphicsd2d.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_helpchm.obj: ..\..\src\msw\helpchm.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\helpchm.cpp
@@ -13978,6 +14001,11 @@ $(OBJS)\corelib_window.obj: ..\..\src\msw\window.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\window.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_graphicsd2d.obj: ..\..\src\msw\graphicsd2d.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\graphicsd2d.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_helpchm.obj: ..\..\src\msw\helpchm.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\helpchm.cpp

28
build/msw/makefile.gcc
View File

@@ -1826,6 +1826,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_utilswin.o \
$(OBJS)\monodll_uxtheme.o \
$(OBJS)\monodll_window.o \
$(OBJS)\monodll_graphicsd2d.o \
$(OBJS)\monodll_helpchm.o \
$(OBJS)\monodll_helpwin.o \
$(OBJS)\monodll_automtn.o \
@@ -2109,6 +2110,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_utilswin.o \
$(OBJS)\monodll_uxtheme.o \
$(OBJS)\monodll_window.o \
$(OBJS)\monodll_graphicsd2d.o \
$(OBJS)\monodll_helpchm.o \
$(OBJS)\monodll_helpwin.o \
$(OBJS)\monodll_automtn.o \
@@ -2640,6 +2642,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_utilswin.o \
$(OBJS)\monolib_uxtheme.o \
$(OBJS)\monolib_window.o \
$(OBJS)\monolib_graphicsd2d.o \
$(OBJS)\monolib_helpchm.o \
$(OBJS)\monolib_helpwin.o \
$(OBJS)\monolib_automtn.o \
@@ -2923,6 +2926,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_utilswin.o \
$(OBJS)\monolib_uxtheme.o \
$(OBJS)\monolib_window.o \
$(OBJS)\monolib_graphicsd2d.o \
$(OBJS)\monolib_helpchm.o \
$(OBJS)\monolib_helpwin.o \
$(OBJS)\monolib_automtn.o \
@@ -3340,6 +3344,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_utilswin.o \
$(OBJS)\coredll_uxtheme.o \
$(OBJS)\coredll_window.o \
$(OBJS)\coredll_graphicsd2d.o \
$(OBJS)\coredll_helpchm.o \
$(OBJS)\coredll_helpwin.o \
$(OBJS)\coredll_automtn.o \
@@ -3623,6 +3628,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_utilswin.o \
$(OBJS)\coredll_uxtheme.o \
$(OBJS)\coredll_window.o \
$(OBJS)\coredll_graphicsd2d.o \
$(OBJS)\coredll_helpchm.o \
$(OBJS)\coredll_helpwin.o \
$(OBJS)\coredll_automtn.o \
@@ -3908,6 +3914,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_utilswin.o \
$(OBJS)\corelib_uxtheme.o \
$(OBJS)\corelib_window.o \
$(OBJS)\corelib_graphicsd2d.o \
$(OBJS)\corelib_helpchm.o \
$(OBJS)\corelib_helpwin.o \
$(OBJS)\corelib_automtn.o \
@@ -4191,6 +4198,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_utilswin.o \
$(OBJS)\corelib_uxtheme.o \
$(OBJS)\corelib_window.o \
$(OBJS)\corelib_graphicsd2d.o \
$(OBJS)\corelib_helpchm.o \
$(OBJS)\corelib_helpwin.o \
$(OBJS)\corelib_automtn.o \
@@ -7818,6 +7826,11 @@ $(OBJS)\monodll_window.o: ../../src/msw/window.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_graphicsd2d.o: ../../src/msw/graphicsd2d.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_helpchm.o: ../../src/msw/helpchm.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -10289,6 +10302,11 @@ $(OBJS)\monolib_window.o: ../../src/msw/window.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_graphicsd2d.o: ../../src/msw/graphicsd2d.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_helpchm.o: ../../src/msw/helpchm.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -12706,6 +12724,11 @@ $(OBJS)\coredll_window.o: ../../src/msw/window.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\coredll_graphicsd2d.o: ../../src/msw/graphicsd2d.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\coredll_helpchm.o: ../../src/msw/helpchm.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -14153,6 +14176,11 @@ $(OBJS)\corelib_window.o: ../../src/msw/window.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\corelib_graphicsd2d.o: ../../src/msw/graphicsd2d.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\corelib_helpchm.o: ../../src/msw/helpchm.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<

3
build/msw/wx_vc7_core.vcproj
View File

@@ -853,6 +853,9 @@
<File
RelativePath="..\..\src\msw\graphics.cpp">
</File>
<File
RelativePath="..\..\src\msw\graphicsd2d.cpp">
</File>
<File
RelativePath="..\..\src\msw\headerctrl.cpp">
</File>

4
build/msw/wx_vc8_core.vcproj
View File

@@ -1542,6 +1542,10 @@
RelativePath="..\..\src\msw\graphics.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\graphicsd2d.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\headerctrl.cpp"
>

4
build/msw/wx_vc9_core.vcproj
View File

@@ -1538,6 +1538,10 @@
RelativePath="..\..\src\msw\graphics.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\graphicsd2d.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\headerctrl.cpp"
>