Regenerated makefiles for 3rd-party lib change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29731 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		| @@ -119,13 +119,13 @@ __WXLIB_MONO_p = \ | ||||
| 	-lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) | ||||
| endif | ||||
| ifeq ($(USE_GUI),1) | ||||
| __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)$(WX_RELEASE_NODOT) | ||||
| __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) | ||||
| endif | ||||
| ifeq ($(USE_GUI),1) | ||||
| __LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)$(WX_RELEASE_NODOT) | ||||
| __LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) | ||||
| endif | ||||
| ifeq ($(USE_GUI),1) | ||||
| __LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)$(WX_RELEASE_NODOT) | ||||
| __LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) | ||||
| endif | ||||
| ifeq ($(MSLU),1) | ||||
| __UNICOWS_LIB_p = -lunicows | ||||
| @@ -167,7 +167,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)$(WX_RELEASE_NODOT)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_RELEASE_NODOT) -lwxexpat$(WXDEBUGFLAG)$(WX_RELEASE_NODOT)  $(__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)  $(__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