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,15 @@ endif
 | 
			
		||||
ifeq ($(SHARED),1)
 | 
			
		||||
WXDLLFLAG = dll
 | 
			
		||||
endif
 | 
			
		||||
ifeq ($(MONOLITHIC),0)
 | 
			
		||||
EXTRALIBS_FOR_BASE = 
 | 
			
		||||
endif
 | 
			
		||||
ifeq ($(MONOLITHIC),1)
 | 
			
		||||
EXTRALIBS_FOR_BASE =  
 | 
			
		||||
endif
 | 
			
		||||
ifeq ($(USE_OPENGL),1)
 | 
			
		||||
__cube___depname = $(OBJS)\cube.exe
 | 
			
		||||
endif
 | 
			
		||||
ifeq ($(BUILD),debug)
 | 
			
		||||
__OPTIMIZEFLAG_2 = -O0
 | 
			
		||||
endif
 | 
			
		||||
@@ -160,14 +169,16 @@ $(OBJS):
 | 
			
		||||
 | 
			
		||||
### Targets: ###
 | 
			
		||||
 | 
			
		||||
all: $(OBJS)\cube.exe
 | 
			
		||||
all: $(__cube___depname)
 | 
			
		||||
 | 
			
		||||
clean: 
 | 
			
		||||
	-if exist $(OBJS)\*.o del $(OBJS)\*.o
 | 
			
		||||
	-if exist $(OBJS)\cube.exe del $(OBJS)\cube.exe
 | 
			
		||||
 | 
			
		||||
ifeq ($(USE_OPENGL),1)
 | 
			
		||||
$(OBJS)\cube.exe: $(CUBE_OBJECTS) $(OBJS)\cube_cube_rc.o
 | 
			
		||||
	$(CXX) -o $@ $(CUBE_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl -lopengl32 -lglu32 $(__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 $@ $(CUBE_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl -lopengl32 -lglu32 $(__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
 | 
			
		||||
 | 
			
		||||
$(OBJS)\cube_cube.o: ./cube.cpp
 | 
			
		||||
	$(CXX) -c -o $@ $(CUBE_CXXFLAGS) $<
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user