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

Merge in from trunk r68684 - r69046

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@69047 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Steve Lamerton
2011-09-10 15:09:22 +00:00
parent d4adec8361 01bd848eb9
commit 1d156af324
283 changed files with 12986 additions and 1945 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/makefile.gcc
View File

@@ -177,6 +177,7 @@ TEST_GUI_OBJECTS = \
$(OBJS)\test_gui_toolbooktest.o \
$(OBJS)\test_gui_treebooktest.o \
$(OBJS)\test_gui_treectrltest.o \
$(OBJS)\test_gui_treelistctrltest.o \
$(OBJS)\test_gui_virtlistctrltest.o \
$(OBJS)\test_gui_webtest.o \
$(OBJS)\test_gui_windowtest.o \
@@ -422,7 +423,7 @@ $(OBJS):
### Targets: ###
all: $(OBJS)\test.exe $(__test_gui___depname) data fr
all: $(OBJS)\test.exe $(__test_gui___depname) data data-images fr
clean:
-if exist $(OBJS)\*.o del $(OBJS)\*.o
@@ -442,6 +443,10 @@ data:
if not exist $(OBJS) mkdir $(OBJS)
for %%f in (horse.ani horse.bmp horse.cur horse.gif horse.ico horse.jpg horse.pcx horse.png horse.pnm horse.tga horse.tif horse.xpm) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
data-images:
if not exist image mkdir image
for %%f in (horse_grey.bmp horse_grey_flipped.bmp horse_rle4.bmp horse_rle4_flipped.bmp horse_rle8.bmp horse_rle8_flipped.bmp) do if not exist image\%%f copy .\image\%%f image
fr:
if not exist $(OBJS)\intl\fr mkdir $(OBJS)\intl\fr
for %%f in (internat.po internat.mo) do if not exist $(OBJS)\intl\fr\%%f copy .\intl\fr\%%f $(OBJS)\intl\fr
@@ -866,6 +871,9 @@ $(OBJS)\test_gui_treebooktest.o: ./controls/treebooktest.cpp
$(OBJS)\test_gui_treectrltest.o: ./controls/treectrltest.cpp
$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\test_gui_treelistctrltest.o: ./controls/treelistctrltest.cpp
$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\test_gui_virtlistctrltest.o: ./controls/virtlistctrltest.cpp
$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
@@ -941,7 +949,7 @@ $(OBJS)\test_gui_setsize.o: ./window/setsize.cpp
$(OBJS)\test_gui_xrctest.o: ./xml/xrctest.cpp
$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
.PHONY: all clean data fr
.PHONY: all clean data data-images fr
SHELL := $(COMSPEC)