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

even GUI test should be console app

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30968 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-12-12 19:25:46 +00:00
parent e07e8195ae
commit 98a50e202c
7 changed files with 156 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/makefile.gcc
View File

@@ -59,7 +59,8 @@ TEST_GUI_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
TEST_GUI_OBJECTS = \
$(OBJS)\test_gui_sample_rc.o \
$(OBJS)\test_gui_dummy.o \
$(OBJS)\test_gui_test.o
$(OBJS)\test_gui_test.o \
$(OBJS)\test_gui_rect.o
### Conditionally set variables: ###
@@ -220,7 +221,7 @@ $(OBJS)\test.exe: $(TEST_OBJECTS)
ifeq ($(USE_GUI),1)
$(OBJS)\test_gui.exe: $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample_rc.o
$(CXX) -o $@ $(TEST_GUI_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(CPPUNIT_LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
$(CXX) -o $@ $(TEST_GUI_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) $(CPPUNIT_LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
endif
data:
@@ -323,4 +324,7 @@ $(OBJS)\test_gui_dummy.o: ./dummy.cpp
$(OBJS)\test_gui_test.o: ./test.cpp
$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $<
$(OBJS)\test_gui_rect.o: ./geometry/rect.cpp
$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $<
.PHONY: all clean data