X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/25a73439590e04730168bee6b691bd6233880ad4..863110af35cd0ee2db1893eeb5cc35c5bbbba4c8:/samples/dialup/makefile.wat diff --git a/samples/dialup/makefile.wat b/samples/dialup/makefile.wat index efbdedee93..382bfecc9b 100644 --- a/samples/dialup/makefile.wat +++ b/samples/dialup/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/config.wat +!include ../../build/msw/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -160,14 +160,13 @@ NETTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(LIBDIRNAME) & -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png & -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=.\..\..\src\expat\lib -i=. & - $(__DLLFLAG_p) $(CXXFLAGS) + $(__DLLFLAG_p) -i=..\..\samples $(CXXFLAGS) NETTEST_OBJECTS = & $(OBJS)\nettest_nettest.obj OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) - all : $(OBJS) $(OBJS) : -if not exist $(OBJS) mkdir $(OBJS) @@ -180,7 +179,7 @@ $(OBJS)\nettest_nettest.obj : .AUTODEPEND .\nettest.cpp $(CXX) -zq -fo=$^@ $(NETTEST_CXXFLAGS) $< $(OBJS)\nettest_nettest.res : .AUTODEPEND .\nettest.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(LIBDIRNAME) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=.\..\..\src\expat\lib -i=. $(__DLLFLAG_p) $< + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(LIBDIRNAME) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=.\..\..\src\expat\lib -i=. $(__DLLFLAG_p) -i=..\..\samples $< clean : .SYMBOLIC -if exist $(OBJS)\*.obj del $(OBJS)\*.obj @@ -196,6 +195,6 @@ $(OBJS)\nettest.exe : $(NETTEST_OBJECTS) $(OBJS)\nettest_nettest.res @%append $(OBJS)\nettest.lbc option incremental @%append $(OBJS)\nettest.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' @for %i in ($(NETTEST_OBJECTS)) do @%append $(OBJS)\nettest.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\nettest.lbc library %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\nettest.lbc library %i @%append $(OBJS)\nettest.lbc option resource=$(OBJS)\nettest_nettest.res wlink @$(OBJS)\nettest.lbc