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:
		| @@ -56,6 +56,12 @@ WXUNIVNAME = univ | ||||
| !if "$(SHARED)" == "1" | ||||
| WXDLLFLAG = dll | ||||
| !endif | ||||
| !if "$(MONOLITHIC)" == "0" | ||||
| EXTRALIBS_FOR_BASE =  | ||||
| !endif | ||||
| !if "$(MONOLITHIC)" == "1" | ||||
| EXTRALIBS_FOR_BASE =   | ||||
| !endif | ||||
| !if "$(BUILD)" == "debug" | ||||
| __OPTIMIZEFLAG_2 = -Od | ||||
| !endif | ||||
| @@ -168,7 +174,7 @@ clean: | ||||
|  | ||||
| $(OBJS)\scrollsub.exe: $(SCROLLSUB_OBJECTS)  $(OBJS)\scrollsub_scrollsub.res | ||||
| 	ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&| | ||||
| 	c0w32.obj $(SCROLLSUB_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib  import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\scrollsub_scrollsub.res | ||||
| 	c0w32.obj $(SCROLLSUB_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib  import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\scrollsub_scrollsub.res | ||||
| | | ||||
|  | ||||
| $(OBJS)\scrollsub_scrollsub.obj: .\scrollsub.cpp | ||||
|   | ||||
		Reference in New Issue
	
	Block a user