X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/25a73439590e04730168bee6b691bd6233880ad4..987263fe1974dac46a38d6d623557ccf89a25992:/samples/artprov/makefile.wat diff --git a/samples/artprov/makefile.wat b/samples/artprov/makefile.wat index 8cf47e4454..9ee072b4da 100644 --- a/samples/artprov/makefile.wat +++ b/samples/artprov/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! @@ -27,6 +27,13 @@ WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- ### Conditionally set variables: ### +LIBDIRNAME = +!ifeq SHARED 0 +LIBDIRNAME = .\..\..\lib\wat_lib$(CFG) +!endif +!ifeq SHARED 1 +LIBDIRNAME = .\..\..\lib\wat_dll$(CFG) +!endif PORTNAME = !ifeq USE_GUI 0 PORTNAME = base @@ -130,7 +137,7 @@ __RUNTIME_LIBS_5 = !endif __UNICODE_DEFINE_p = !ifeq UNICODE 1 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +__UNICODE_DEFINE_p = -d_UNICODE !endif __WXLIB_BASE_p = !ifeq MONOLITHIC 0 @@ -155,18 +162,15 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ARTTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & $(__RUNTIME_LIBS_5) -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) $(CXXFLAGS) + $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples $(CXXFLAGS) ARTTEST_OBJECTS = & $(OBJS)\arttest_arttest.obj & $(OBJS)\arttest_artbrows.obj -LIBDIRNAME = & - .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) - +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) all : $(OBJS) @@ -184,16 +188,16 @@ $(OBJS)\arttest_arttest.obj : .AUTODEPEND .\arttest.cpp $(CXX) -zq -fo=$^@ $(ARTTEST_CXXFLAGS) $< $(OBJS)\arttest_arttest.res : .AUTODEPEND .\arttest.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=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples $< $(OBJS)\arttest.exe : $(ARTTEST_OBJECTS) $(OBJS)\arttest_arttest.res @%create $(OBJS)\arttest.lbc @%append $(OBJS)\arttest.lbc option quiet @%append $(OBJS)\arttest.lbc name $^@ - @%append $(OBJS)\arttest.lbc option incremental + @%append $(OBJS)\arttest.lbc option caseexact @%append $(OBJS)\arttest.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' @for %i in ($(ARTTEST_OBJECTS)) do @%append $(OBJS)\arttest.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)\arttest.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)\arttest.lbc library %i @%append $(OBJS)\arttest.lbc option resource=$(OBJS)\arttest_arttest.res wlink @$(OBJS)\arttest.lbc