added bookctrl.h, listbook.h

[wxWidgets.git] / contrib / build / deprecated / makefile.vc

diff --git a/contrib/build/deprecated/makefile.vc b/contrib/build/deprecated/makefile.vc
index 3bea1b86157c4eaa927071dd7ec7450f2255e05b..744240d6d535ab2b7f3ba7c0ccd94ee07d0fa885 100644 (file)
--- a/contrib/build/deprecated/makefile.vc
+++ b/contrib/build/deprecated/makefile.vc
@@ -4,7 +4,7 @@
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

-!include <../../../build/config.vc>
+!include <../../../build/msw/config.vc>

 
 # -------------------------------------------------------------------------
 # Do not modify the rest of this file!
 
 # -------------------------------------------------------------------------
 # Do not modify the rest of this file!


@@ -17,35 +17,25 @@ DEPRECATEDDLL_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \

-       /I..\..\src\deprecated\..\..\..\include /I$(LIBDIRNAME) \
-       /I..\..\src\deprecated\..\..\..\src\tiff \
-       /I..\..\src\deprecated\..\..\..\src\jpeg \
-       /I..\..\src\deprecated\..\..\..\src\png \
-       /I..\..\src\deprecated\..\..\..\src\zlib \
-       /I..\..\src\deprecated\..\..\..\src\regex \
-       /I..\..\src\deprecated\..\..\..\src\expat\lib \
+       /I..\..\src\deprecated\..\..\..\include /I$(SETUPHDIR) \

        /I..\..\src\deprecated\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_DEPRECATED \
        /I..\..\src\deprecated\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_DEPRECATED \

-       $(CFLAGS)
+       /I..\..\src\deprecated $(CFLAGS)

 DEPRECATEDDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) \
        /DWIN32 $(__DEBUGINFO_2) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
 DEPRECATEDDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) \
        /DWIN32 $(__DEBUGINFO_2) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \

-       /I..\..\src\deprecated\..\..\..\include /I$(LIBDIRNAME) \
-       /I..\..\src\deprecated\..\..\..\src\tiff \
-       /I..\..\src\deprecated\..\..\..\src\jpeg \
-       /I..\..\src\deprecated\..\..\..\src\png \
-       /I..\..\src\deprecated\..\..\..\src\zlib \
-       /I..\..\src\deprecated\..\..\..\src\regex \
-       /I..\..\src\deprecated\..\..\..\src\expat\lib \
+       /I..\..\src\deprecated\..\..\..\include /I$(SETUPHDIR) \

        /I..\..\src\deprecated\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_DEPRECATED \
        /I..\..\src\deprecated\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_DEPRECATED \

-       $(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_deprecateddll.pch"
+       /I..\..\src\deprecated $(CXXFLAGS) /Yu"wx/wxprec.h" \
+       /Fp"$(OBJS)\wxprec_deprecateddll.pch"

 DEPRECATEDDLL_OBJECTS =  \
        $(OBJS)\deprecateddll_dummy.obj \
        $(OBJS)\deprecateddll_prop.obj \
        $(OBJS)\deprecateddll_propform.obj \
        $(OBJS)\deprecateddll_proplist.obj \
        $(OBJS)\deprecateddll_resource.obj \
 DEPRECATEDDLL_OBJECTS =  \
        $(OBJS)\deprecateddll_dummy.obj \
        $(OBJS)\deprecateddll_prop.obj \
        $(OBJS)\deprecateddll_propform.obj \
        $(OBJS)\deprecateddll_proplist.obj \
        $(OBJS)\deprecateddll_resource.obj \

+       $(OBJS)\deprecateddll_tbarsmpl.obj \

        $(OBJS)\deprecateddll_treelay.obj \
        $(OBJS)\deprecateddll_wxexpr.obj \
        $(OBJS)\deprecateddll_dosyacc.obj
        $(OBJS)\deprecateddll_treelay.obj \
        $(OBJS)\deprecateddll_wxexpr.obj \
        $(OBJS)\deprecateddll_dosyacc.obj


@@ -54,44 +44,39 @@ DEPRECATEDLIB_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_12) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.pdb \
        $(____DEBUGRUNTIME_11_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.pdb \
        $(____DEBUGRUNTIME_11_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \

-       /I..\..\src\deprecated\..\..\..\include /I$(LIBDIRNAME) \
-       /I..\..\src\deprecated\..\..\..\src\tiff \
-       /I..\..\src\deprecated\..\..\..\src\jpeg \
-       /I..\..\src\deprecated\..\..\..\src\png \
-       /I..\..\src\deprecated\..\..\..\src\zlib \
-       /I..\..\src\deprecated\..\..\..\src\regex \
-       /I..\..\src\deprecated\..\..\..\src\expat\lib \
-       /I..\..\src\deprecated\..\..\include $(CFLAGS)
+       /I..\..\src\deprecated\..\..\..\include /I$(SETUPHDIR) \
+       /I..\..\src\deprecated\..\..\include /I..\..\src\deprecated $(CFLAGS)

 DEPRECATEDLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_12) \
        /DWIN32 $(__DEBUGINFO_2) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.pdb \
        $(____DEBUGRUNTIME_11_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
 DEPRECATEDLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_12) \
        /DWIN32 $(__DEBUGINFO_2) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.pdb \
        $(____DEBUGRUNTIME_11_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \

-       /I..\..\src\deprecated\..\..\..\include /I$(LIBDIRNAME) \
-       /I..\..\src\deprecated\..\..\..\src\tiff \
-       /I..\..\src\deprecated\..\..\..\src\jpeg \
-       /I..\..\src\deprecated\..\..\..\src\png \
-       /I..\..\src\deprecated\..\..\..\src\zlib \
-       /I..\..\src\deprecated\..\..\..\src\regex \
-       /I..\..\src\deprecated\..\..\..\src\expat\lib \
-       /I..\..\src\deprecated\..\..\include $(CXXFLAGS) /Yu"wx/wxprec.h" \
-       /Fp"$(OBJS)\wxprec_deprecatedlib.pch"
+       /I..\..\src\deprecated\..\..\..\include /I$(SETUPHDIR) \
+       /I..\..\src\deprecated\..\..\include /I..\..\src\deprecated $(CXXFLAGS) \
+       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_deprecatedlib.pch"

 DEPRECATEDLIB_OBJECTS =  \
        $(OBJS)\deprecatedlib_dummy.obj \
        $(OBJS)\deprecatedlib_prop.obj \
        $(OBJS)\deprecatedlib_propform.obj \
        $(OBJS)\deprecatedlib_proplist.obj \
        $(OBJS)\deprecatedlib_resource.obj \
 DEPRECATEDLIB_OBJECTS =  \
        $(OBJS)\deprecatedlib_dummy.obj \
        $(OBJS)\deprecatedlib_prop.obj \
        $(OBJS)\deprecatedlib_propform.obj \
        $(OBJS)\deprecatedlib_proplist.obj \
        $(OBJS)\deprecatedlib_resource.obj \

+       $(OBJS)\deprecatedlib_tbarsmpl.obj \

        $(OBJS)\deprecatedlib_treelay.obj \
        $(OBJS)\deprecatedlib_wxexpr.obj \
        $(OBJS)\deprecatedlib_dosyacc.obj
        $(OBJS)\deprecatedlib_treelay.obj \
        $(OBJS)\deprecatedlib_wxexpr.obj \
        $(OBJS)\deprecatedlib_dosyacc.obj

-LIBDIRNAME = \
-       ..\..\src\deprecated\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)

 OBJS = \
        vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 OBJS = \
        vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)

+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)

 
 ### Conditionally set variables: ###
 
 
 ### Conditionally set variables: ###
 

+!if "$(SHARED)" == "0"
+LIBDIRNAME = ..\..\src\deprecated\..\..\..\lib\vc_lib$(CFG)
+!endif
+!if "$(SHARED)" == "1"
+LIBDIRNAME = ..\..\src\deprecated\..\..\..\lib\vc_dll$(CFG)
+!endif

 !if "$(USE_GUI)" == "0"
 PORTNAME = base
 !endif
 !if "$(USE_GUI)" == "0"
 PORTNAME = base
 !endif


@@ -203,6 +188,9 @@ __RUNTIME_LIBS = T
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
 !endif
 !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
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif


@@ -283,6 +271,9 @@ $(OBJS)\deprecateddll_proplist.obj: ../../src/deprecated\proplist.cpp
 $(OBJS)\deprecateddll_resource.obj: ../../src/deprecated\resource.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDDLL_CXXFLAGS) $**
 
 $(OBJS)\deprecateddll_resource.obj: ../../src/deprecated\resource.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDDLL_CXXFLAGS) $**
 

+$(OBJS)\deprecateddll_tbarsmpl.obj: ../../src/deprecated\tbarsmpl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDDLL_CXXFLAGS) $**
+

 $(OBJS)\deprecateddll_treelay.obj: ../../src/deprecated\treelay.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDDLL_CXXFLAGS) $**
 
 $(OBJS)\deprecateddll_treelay.obj: ../../src/deprecated\treelay.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDDLL_CXXFLAGS) $**
 


@@ -307,6 +298,9 @@ $(OBJS)\deprecatedlib_proplist.obj: ../../src/deprecated\proplist.cpp
 $(OBJS)\deprecatedlib_resource.obj: ../../src/deprecated\resource.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDLIB_CXXFLAGS) $**
 
 $(OBJS)\deprecatedlib_resource.obj: ../../src/deprecated\resource.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDLIB_CXXFLAGS) $**
 

+$(OBJS)\deprecatedlib_tbarsmpl.obj: ../../src/deprecated\tbarsmpl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDLIB_CXXFLAGS) $**
+

 $(OBJS)\deprecatedlib_treelay.obj: ../../src/deprecated\treelay.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDLIB_CXXFLAGS) $**
 
 $(OBJS)\deprecatedlib_treelay.obj: ../../src/deprecated\treelay.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDLIB_CXXFLAGS) $**
 


@@ -321,14 +315,14 @@ clean:
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib
 
 !if "$(SHARED)" == "1"
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib
 
 !if "$(SHARED)" == "1"

-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_vc$(VENDORTAG).dll: $(DEPRECATEDDLL_OBJECTS) $(OBJS)\deprecateddll_dummy.obj
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_vc$(VENDORTAG).dll: $(OBJS)\deprecateddll_dummy.obj  $(DEPRECATEDDLL_OBJECTS)

        link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) @<<
        link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) @<<

-       $(DEPRECATEDDLL_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)_deprecated.lib
+       $(DEPRECATEDDLL_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)_deprecated.lib

 <<
 !endif
 
 !if "$(SHARED)" == "0"
 <<
 !endif
 
 !if "$(SHARED)" == "0"

-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib: $(DEPRECATEDLIB_OBJECTS) $(OBJS)\deprecatedlib_dummy.obj
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib: $(OBJS)\deprecatedlib_dummy.obj  $(DEPRECATEDLIB_OBJECTS)

        if exist $@ del $@
        lib /NOLOGO /OUT:$@ @<<
        $(DEPRECATEDLIB_OBJECTS)
        if exist $@ del $@
        lib /NOLOGO /OUT:$@ @<<
        $(DEPRECATEDLIB_OBJECTS)