wxURI. Move Convert/to/fromURI into uri.cpp so that it is compiled in base. Regenerate Bakefiles.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30125 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		| @@ -54,6 +54,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 | ||||
| @@ -167,7 +173,7 @@ clean: | ||||
| 	-if exist $(OBJS)\nettest.exe del $(OBJS)\nettest.exe | ||||
|  | ||||
| $(OBJS)\nettest.exe: $(NETTEST_OBJECTS) $(OBJS)\nettest_nettest_rc.o | ||||
| 	$(CXX) -o $@ $(NETTEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  $(__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)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 | ||||
| 	$(CXX) -o $@ $(NETTEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  $(__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 | ||||
|  | ||||
| $(OBJS)\nettest_nettest.o: ./nettest.cpp | ||||
| 	$(CXX) -c -o $@ $(NETTEST_CXXFLAGS) $< | ||||
|   | ||||
		Reference in New Issue
	
	Block a user