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

wxURI. Move Convert/to/fromURI into uri.cpp so that it is compiled in base. Regenerate Bakefiles.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30125 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ryan Norton
2004-10-27 22:47:26 +00:00
parent c0b0635cf6
commit dd65d8c830
554 changed files with 7168 additions and 1401 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
tests/makefile.gcc
View File

@@ -23,16 +23,18 @@ TEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H \
$(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS)
TEST_OBJECTS = \
$(OBJS)\test_test.o \
$(OBJS)\test_main.o \
$(OBJS)\test_formatconverter.o \
$(OBJS)\test_regex.o \
$(OBJS)\test_wxregex.o \
$(OBJS)\test_arrays.o \
$(OBJS)\test_datetime.o \
$(OBJS)\test_fileconf.o \
$(OBJS)\test_filename.o \
$(OBJS)\test_filesys.o \
$(OBJS)\test_arrays.o \
$(OBJS)\test_fontmap.o \
$(OBJS)\test_formatconverter.o \
$(OBJS)\test_hashes.o \
$(OBJS)\test_longlong.o \
$(OBJS)\test_main.o \
$(OBJS)\test_regex.o \
$(OBJS)\test_wxregex.o \
$(OBJS)\test_strings.o \
$(OBJS)\test_stdstrings.o \
$(OBJS)\test_unicode.o \
@@ -43,8 +45,7 @@ TEST_OBJECTS = \
$(OBJS)\test_memstream.o \
$(OBJS)\test_sstream.o \
$(OBJS)\test_zlibstream.o \
$(OBJS)\test_fontmap.o \
$(OBJS)\test_datetime.o
$(OBJS)\test_uris.o
### Conditionally set variables: ###
@@ -74,6 +75,12 @@ endif
ifeq ($(SHARED),1)
WXDLLFLAG = dll
endif
ifeq ($(MONOLITHIC),0)
EXTRALIBS_FOR_BASE =
endif
ifeq ($(MONOLITHIC),1)
EXTRALIBS_FOR_BASE =
endif
ifeq ($(BUILD),debug)
__OPTIMIZEFLAG_2 = -O0
endif
@@ -166,7 +173,7 @@ clean:
-if exist $(OBJS)\test.exe del $(OBJS)\test.exe
$(OBJS)\test.exe: $(TEST_OBJECTS)
$(CXX) -o $@ $(TEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) $(CPPUNIT_LIBS) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
$(CXX) -o $@ $(TEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) $(CPPUNIT_LIBS) $(__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
data:
if not exist $(OBJS) mkdir $(OBJS)
@@ -175,16 +182,10 @@ data:
$(OBJS)\test_test.o: ./test.cpp
$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
$(OBJS)\test_main.o: ./mbconv/main.cpp
$(OBJS)\test_arrays.o: ./arrays/arrays.cpp
$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
$(OBJS)\test_formatconverter.o: ./formatconverter/formatconverter.cpp
$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
$(OBJS)\test_regex.o: ./regex/regex.cpp
$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
$(OBJS)\test_wxregex.o: ./regex/wxregex.cpp
$(OBJS)\test_datetime.o: ./datetime/datetime.cpp
$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
$(OBJS)\test_fileconf.o: ./fileconf/fileconf.cpp
@@ -196,7 +197,10 @@ $(OBJS)\test_filename.o: ./filename/filename.cpp
$(OBJS)\test_filesys.o: ./filesys/filesys.cpp
$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
$(OBJS)\test_arrays.o: ./arrays/arrays.cpp
$(OBJS)\test_fontmap.o: ./fontmap/fontmap.cpp
$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
$(OBJS)\test_formatconverter.o: ./formatconverter/formatconverter.cpp
$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
$(OBJS)\test_hashes.o: ./hashes/hashes.cpp
@@ -205,6 +209,15 @@ $(OBJS)\test_hashes.o: ./hashes/hashes.cpp
$(OBJS)\test_longlong.o: ./longlong/longlong.cpp
$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
$(OBJS)\test_main.o: ./mbconv/main.cpp
$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
$(OBJS)\test_regex.o: ./regex/regex.cpp
$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
$(OBJS)\test_wxregex.o: ./regex/wxregex.cpp
$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
$(OBJS)\test_strings.o: ./strings/strings.cpp
$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
@@ -235,10 +248,7 @@ $(OBJS)\test_sstream.o: ./streams/sstream.cpp
$(OBJS)\test_zlibstream.o: ./streams/zlibstream.cpp
$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
$(OBJS)\test_fontmap.o: ./fontmap/fontmap.cpp
$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
$(OBJS)\test_datetime.o: ./datetime/datetime.cpp
$(OBJS)\test_uris.o: ./uris/uris.cpp
$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
.PHONY: all clean data