X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fd9f42b6a94f9d68c66cf363093442b12cd4e953..f284605f65f6f957c90452b574f4131079819b53:/contrib/build/animate/makefile.vc?ds=sidebyside diff --git a/contrib/build/animate/makefile.vc b/contrib/build/animate/makefile.vc index 61b460a793..45e796c906 100644 --- a/contrib/build/animate/makefile.vc +++ b/contrib/build/animate/makefile.vc @@ -17,13 +17,7 @@ ANIMATEDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_vc$(VENDORTAG).pdb \ $(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ - /I..\..\src\animate\..\..\..\include /I$(LIBDIRNAME) \ - /I..\..\src\animate\..\..\..\src\tiff \ - /I..\..\src\animate\..\..\..\src\jpeg \ - /I..\..\src\animate\..\..\..\src\png \ - /I..\..\src\animate\..\..\..\src\zlib \ - /I..\..\src\animate\..\..\..\src\regex \ - /I..\..\src\animate\..\..\..\src\expat\lib \ + /I..\..\src\animate\..\..\..\include /I$(SETUPHDIR) \ /I..\..\src\animate\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_ANIMATE \ $(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_animatedll.pch" ANIMATEDLL_OBJECTS = \ @@ -34,25 +28,25 @@ ANIMATELIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_12) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.pdb \ $(____DEBUGRUNTIME_11_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ - /I..\..\src\animate\..\..\..\include /I$(LIBDIRNAME) \ - /I..\..\src\animate\..\..\..\src\tiff \ - /I..\..\src\animate\..\..\..\src\jpeg \ - /I..\..\src\animate\..\..\..\src\png \ - /I..\..\src\animate\..\..\..\src\zlib \ - /I..\..\src\animate\..\..\..\src\regex \ - /I..\..\src\animate\..\..\..\src\expat\lib \ + /I..\..\src\animate\..\..\..\include /I$(SETUPHDIR) \ /I..\..\src\animate\..\..\include $(CXXFLAGS) /Yu"wx/wxprec.h" \ /Fp"$(OBJS)\wxprec_animatelib.pch" ANIMATELIB_OBJECTS = \ $(OBJS)\animatelib_dummy.obj \ $(OBJS)\animatelib_animate.obj -LIBDIRNAME = \ - ..\..\src\animate\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) ### Conditionally set variables: ### +!if "$(SHARED)" == "0" +LIBDIRNAME = ..\..\src\animate\..\..\..\lib\vc_lib$(CFG) +!endif +!if "$(SHARED)" == "1" +LIBDIRNAME = ..\..\src\animate\..\..\..\lib\vc_dll$(CFG) +!endif !if "$(USE_GUI)" == "0" PORTNAME = base !endif @@ -164,6 +158,9 @@ __RUNTIME_LIBS = T !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif !if "$(MONOLITHIC)" == "0" __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif @@ -239,14 +236,14 @@ $(OBJS)\animatelib_dummy.obj: ../../src/animate\..\..\..\src\msw\dummy.cpp $(CXX) /c /nologo /TP /Fo$@ $(ANIMATELIB_CXXFLAGS) /Ycwx/wxprec.h $** !if "$(SHARED)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_vc$(VENDORTAG).dll: $(ANIMATEDLL_OBJECTS) $(OBJS)\animatedll_dummy.obj +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_vc$(VENDORTAG).dll: $(OBJS)\animatedll_dummy.obj $(ANIMATEDLL_OBJECTS) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /LIBPATH:$(LIBDIRNAME) @<< - $(ANIMATEDLL_OBJECTS) $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib + $(ANIMATEDLL_OBJECTS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) 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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib << !endif !if "$(SHARED)" == "0" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib: $(ANIMATELIB_OBJECTS) $(OBJS)\animatelib_dummy.obj +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib: $(OBJS)\animatelib_dummy.obj $(ANIMATELIB_OBJECTS) if exist $@ del $@ lib /NOLOGO /OUT:$@ @<< $(ANIMATELIB_OBJECTS)