Install wxrc with proper library dependencies under OS X.

[wxWidgets.git] / samples / render / makefile.wat

diff --git a/samples/render/makefile.wat b/samples/render/makefile.wat
index 41ab2e65735e0d1c0fec91e22e594c3e508afd1d..e0a5dd7b9c38b27e31fe5a72ad683673d1e04445 100644 (file)
--- a/samples/render/makefile.wat
+++ b/samples/render/makefile.wat
@@ -82,7 +82,7 @@ EXTRALIBS_FOR_BASE =
 __renddll___depname =\r
 !ifeq SHARED 1\r
 __renddll___depname = &\r
 __renddll___depname =\r
 !ifeq SHARED 1\r
 __renddll___depname = &\r

-       $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)$(WXCOMPILER).dll\r
+       $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_RELEASE_NODOT)$(WXCOMPILER).dll\r

 !endif\r
 __DEBUGINFO =\r
 !ifeq BUILD debug\r
 !endif\r
 __DEBUGINFO =\r
 !ifeq BUILD debug\r


@@ -207,6 +207,12 @@ __WXLIB_MONO_p =
 __WXLIB_MONO_p = &\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
 __WXLIB_MONO_p = &\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r

+__LIB_SCINTILLA_IF_MONO_p =\r
+!ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1\r
+__LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
+!endif\r
+!endif\r

 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r


@@ -230,8 +236,7 @@ ____CAIRO_LIBDIR_FILENAMES = libpath $(CAIRO_ROOT)\lib
 \r
 ### Variables: ###\r
 \r
 \r
 ### Variables: ###\r
 \r

-WX_RELEASE_NODOT = 29\r
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)5\r
+WX_RELEASE_NODOT = 30\r

 COMPILER_PREFIX = wat\r
 OBJS = &\r
        $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
 COMPILER_PREFIX = wat\r
 OBJS = &\r
        $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r


@@ -274,7 +279,7 @@ clean : .SYMBOLIC
        -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\render.exe del $(OBJS)\render.exe\r
        -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\render.exe del $(OBJS)\render.exe\r

-       -if exist $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)$(WXCOMPILER).dll del $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)$(WXCOMPILER).dll\r
+       -if exist $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_RELEASE_NODOT)$(WXCOMPILER).dll del $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_RELEASE_NODOT)$(WXCOMPILER).dll\r

 \r
 $(OBJS)\render.exe :  $(RENDER_OBJECTS) $(OBJS)\render_sample.res\r
        @%create $(OBJS)\render.lbc\r
 \r
 $(OBJS)\render.exe :  $(RENDER_OBJECTS) $(OBJS)\render_sample.res\r
        @%create $(OBJS)\render.lbc\r


@@ -283,20 +288,20 @@ $(OBJS)\render.exe :  $(RENDER_OBJECTS) $(OBJS)\render_sample.res
        @%append $(OBJS)\render.lbc option caseexact\r
        @%append $(OBJS)\render.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
        @for %i in ($(RENDER_OBJECTS)) do @%append $(OBJS)\render.lbc file %i\r
        @%append $(OBJS)\render.lbc option caseexact\r
        @%append $(OBJS)\render.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
        @for %i in ($(RENDER_OBJECTS)) do @%append $(OBJS)\render.lbc file %i\r

-       @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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\render.lbc library %i\r
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\render.lbc library %i\r

        @%append $(OBJS)\render.lbc option resource=$(OBJS)\render_sample.res\r
        @for %i in () do @%append $(OBJS)\render.lbc option stack=%i\r
        wlink @$(OBJS)\render.lbc\r
 \r
 !ifeq SHARED 1\r
        @%append $(OBJS)\render.lbc option resource=$(OBJS)\render_sample.res\r
        @for %i in () do @%append $(OBJS)\render.lbc option stack=%i\r
        wlink @$(OBJS)\render.lbc\r
 \r
 !ifeq SHARED 1\r

-$(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)$(WXCOMPILER).dll :  $(RENDDLL_OBJECTS)\r
+$(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_RELEASE_NODOT)$(WXCOMPILER).dll :  $(RENDDLL_OBJECTS)\r

        @%create $(OBJS)\renddll.lbc\r
        @%append $(OBJS)\renddll.lbc option quiet\r
        @%append $(OBJS)\renddll.lbc name $^@\r
        @%append $(OBJS)\renddll.lbc option caseexact\r
        @%append $(OBJS)\renddll.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
        @for %i in ($(RENDDLL_OBJECTS)) do @%append $(OBJS)\renddll.lbc file %i\r
        @%create $(OBJS)\renddll.lbc\r
        @%append $(OBJS)\renddll.lbc option quiet\r
        @%append $(OBJS)\renddll.lbc name $^@\r
        @%append $(OBJS)\renddll.lbc option caseexact\r
        @%append $(OBJS)\renddll.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
        @for %i in ($(RENDDLL_OBJECTS)) do @%append $(OBJS)\renddll.lbc file %i\r

-       @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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\renddll.lbc library %i\r
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\renddll.lbc library %i\r

        @%append $(OBJS)\renddll.lbc\r
        @%append $(OBJS)\renddll.lbc system nt_dll\r
        wlink @$(OBJS)\renddll.lbc\r
        @%append $(OBJS)\renddll.lbc\r
        @%append $(OBJS)\renddll.lbc system nt_dll\r
        wlink @$(OBJS)\renddll.lbc\r