Build corrections

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38332 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/dataview/dataview.bkl b/samples/dataview/dataview.bkl
index 1fb654c78e203ecda2bd6525c7d961f2dd1ac515..917f86d400b151152ae3b1ec2ad6184361588fbf 100644 (file)
--- a/samples/dataview/dataview.bkl
+++ b/samples/dataview/dataview.bkl
@@ -8,7 +8,7 @@
         <wx-lib>adv</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <wx-lib>adv</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>

-        <win32-res>dataview.rc</win32-res>
+        <win32-res>../sample.rc</win32-res>

     </exe>
 
 </makefile>
     </exe>
 
 </makefile>

diff --git a/samples/dataview/dataview.dsp b/samples/dataview/dataview.dsp
index 5218092b8e155dfc0412f151bca88cc32119116f..2309748952b81faa28b9a310b80b8cd1cfcae3cd 100644 (file)
--- a/samples/dataview/dataview.dsp
+++ b/samples/dataview/dataview.dsp
@@ -472,7 +472,7 @@ SOURCE=.\dataview.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\dataview.rc
+SOURCE=.\..\sample.rc

 # End Source File
 # End Group
 # End Target
 # End Source File
 # End Group
 # End Target

diff --git a/samples/dataview/dataview.rc b/samples/dataview/dataview.rc
deleted file mode 100644 (file)
index b862bd2..0000000
--- a/samples/dataview/dataview.rc
+++ /dev/null
@@ -1,3 +0,0 @@
-mondrian ICON "sample.ico"
-#include "wx/msw/wx.rc"
-

diff --git a/samples/dataview/makefile.bcc b/samples/dataview/makefile.bcc
index 74b86ff543fba92c42d5366bdfce13984a2be90b..0ded0cade7af850ecc4d685f04191052d41c5ce6 100644 (file)
--- a/samples/dataview/makefile.bcc
+++ b/samples/dataview/makefile.bcc
@@ -216,14 +216,14 @@ clean:
        -if exist $(OBJS)\dataview.ilf del $(OBJS)\dataview.ilf
        -if exist $(OBJS)\dataview.ils del $(OBJS)\dataview.ils
 
        -if exist $(OBJS)\dataview.ilf del $(OBJS)\dataview.ilf
        -if exist $(OBJS)\dataview.ils del $(OBJS)\dataview.ils
 

-$(OBJS)\dataview.exe: $(DATAVIEW_OBJECTS)  $(OBJS)\dataview_dataview.res
+$(OBJS)\dataview.exe: $(DATAVIEW_OBJECTS)  $(OBJS)\dataview_sample.res

        ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|
        ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|

-       c0w32.obj $(DATAVIEW_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__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) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib  import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\dataview_dataview.res
+       c0w32.obj $(DATAVIEW_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__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) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib  import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\dataview_sample.res

 |
 
 $(OBJS)\dataview_dataview.obj: .\dataview.cpp
        $(CXX) -q -c -P -o$@ $(DATAVIEW_CXXFLAGS) $**
 
 |
 
 $(OBJS)\dataview_dataview.obj: .\dataview.cpp
        $(CXX) -q -c -P -o$@ $(DATAVIEW_CXXFLAGS) $**
 

-$(OBJS)\dataview_dataview.res: .\dataview.rc
+$(OBJS)\dataview_sample.res: .\..\sample.rc

        brcc32 -32 -r -fo$@ -i$(BCCDIR)\include   -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH $**
 
        brcc32 -32 -r -fo$@ -i$(BCCDIR)\include   -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH $**
 

diff --git a/samples/dataview/makefile.dms b/samples/dataview/makefile.dms
deleted file mode 100644 (file)
index 8648c04..0000000
--- a/samples/dataview/makefile.dms
+++ /dev/null
@@ -1,199 +0,0 @@
-# =========================================================================
-#     This makefile was generated by
-#     Bakefile 0.2.0 (http://bakefile.sourceforge.net)
-#     Do not modify, all changes will be overwritten!
-# =========================================================================
-
-.LONGCOMMANDLINE: dmc link lib smake
-
-!include ../../build/msw/config.dms
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw
-!endif
-!if "$(BUILD)" == "debug"
-!if "$(DEBUG_FLAG)" == "default"
-WXDEBUGFLAG = d
-!endif
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-WXDEBUGFLAG = d
-!endif
-!if "$(UNICODE)" == "1"
-WXUNICODEFLAG = u
-!endif
-!if "$(WXUNIV)" == "1"
-WXUNIVNAME = univ
-!endif
-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
-!endif
-!if "$(SHARED)" == "0"
-LIBTYPE_SUFFIX = lib
-!endif
-!if "$(SHARED)" == "1"
-LIBTYPE_SUFFIX = dll
-!endif
-!if "$(MONOLITHIC)" == "0"
-EXTRALIBS_FOR_BASE = 
-!endif
-!if "$(MONOLITHIC)" == "1"
-EXTRALIBS_FOR_BASE =  
-!endif
-!if "$(BUILD)" == "debug"
-!if "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_0 = -g
-!endif
-!endif
-!if "$(BUILD)" == "release"
-!if "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_0 = 
-!endif
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_0 = 
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_0 = -g
-!endif
-!if "$(BUILD)" == "debug"
-!if "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 = /DEBUG /CODEVIEW
-!endif
-!endif
-!if "$(BUILD)" == "release"
-!if "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 = 
-!endif
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_1 = 
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_1 = /DEBUG /CODEVIEW
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG_2 = -o+none
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG_2 = -o
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_5 = -ND
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_5 = 
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTIFLAG_6 = 
-!endif
-!if "$(USE_RTTI)" == "1"
-__RTTIFLAG_6 = -Ar
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONSFLAG_7 = 
-!endif
-!if "$(USE_EXCEPTIONS)" == "1"
-__EXCEPTIONSFLAG_7 = -Ae
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_ADV_p = \
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_CORE_p = \
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = \
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1"
-__WXLIB_MONO_p = \
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-!if "$(MSLU)" == "1"
-__UNICOWS_LIB_p = unicows.lib
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-!endif
-!if "$(BUILD)" == "debug"
-!if "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-!endif
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = -DwxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = -DwxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = -D_UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = -DWXUSINGDLL
-!endif
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 27
-OBJS = dmc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\lib\dmc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-DATAVIEW_CXXFLAGS =  $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2)  $(__RUNTIME_LIBS_5)   -D_WIN32_WINNT=0x0400 -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -w- -I. $(__DLLFLAG_p) -WA -I.\..\..\samples -DNOPCH  $(__RTTIFLAG_6) $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS)
-DATAVIEW_OBJECTS =  $(OBJS)\dataview_dataview.obj
-
-
-all : $(OBJS)
-$(OBJS) :
-       -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-
-all :  $(OBJS)\dataview.exe
-
-clean :  
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res
-       -if exist $(OBJS)\*.sym del $(OBJS)\*.sym
-       -if exist $(OBJS)\dataview.exe del $(OBJS)\dataview.exe
-       -if exist $(OBJS)\dataview.map del $(OBJS)\dataview.map
-
-$(OBJS)\dataview.exe :  $(DATAVIEW_OBJECTS)  $(OBJS)\dataview_dataview.res
-       link /NOLOGO /SILENT /NOI /DELEXECUTABLE /EXETYPE:NT $(LDFLAGS) $(__DEBUGINFO_1)  /su:windows:4.0 $(DATAVIEW_OBJECTS),$@,$(OBJS)\dataview.map, $(LIBDIRNAME)\ $(__WXLIB_ADV_p)  $(__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) $(__UNICOWS_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 odbc32.lib ,, $(OBJS)\dataview_dataview.res
-
-$(OBJS)\dataview_dataview.obj :  .\dataview.cpp
-       $(CXX) -mn -c -cpp -o$@ $(DATAVIEW_CXXFLAGS) .\dataview.cpp
-
-$(OBJS)\dataview_dataview.res :  .\dataview.rc
-       rcc .\dataview.rc -o$@  -D_WIN32_WINNT=0x0400 -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH -32 -v-

diff --git a/samples/dataview/makefile.gcc b/samples/dataview/makefile.gcc
index 58c53d25046058740ac764028ae517c0def3b9fe..9ea33d755ea5c9efa2c3238b4a8e47385e7c6ee0 100644 (file)
--- a/samples/dataview/makefile.gcc
+++ b/samples/dataview/makefile.gcc
@@ -28,7 +28,7 @@ DATAVIEW_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
        $(CPPFLAGS) $(CXXFLAGS)
 DATAVIEW_OBJECTS =  \
        $(OBJS)\dataview_dataview.o \
        $(CPPFLAGS) $(CXXFLAGS)
 DATAVIEW_OBJECTS =  \
        $(OBJS)\dataview_dataview.o \

-       $(OBJS)\dataview_dataview_rc.o
+       $(OBJS)\dataview_sample_rc.o

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


@@ -211,13 +211,13 @@ clean:
        -if exist $(OBJS)\*.d del $(OBJS)\*.d
        -if exist $(OBJS)\dataview.exe del $(OBJS)\dataview.exe
 
        -if exist $(OBJS)\*.d del $(OBJS)\*.d
        -if exist $(OBJS)\dataview.exe del $(OBJS)\dataview.exe
 

-$(OBJS)\dataview.exe: $(DATAVIEW_OBJECTS) $(OBJS)\dataview_dataview_rc.o
+$(OBJS)\dataview.exe: $(DATAVIEW_OBJECTS) $(OBJS)\dataview_sample_rc.o

        $(CXX) -o $@ $(DATAVIEW_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
 
 $(OBJS)\dataview_dataview.o: ./dataview.cpp
        $(CXX) -c -o $@ $(DATAVIEW_CXXFLAGS) $(CPPDEPS) $<
 
        $(CXX) -o $@ $(DATAVIEW_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
 
 $(OBJS)\dataview_dataview.o: ./dataview.cpp
        $(CXX) -c -o $@ $(DATAVIEW_CXXFLAGS) $(CPPDEPS) $<
 

-$(OBJS)\dataview_dataview_rc.o: ./dataview.rc
+$(OBJS)\dataview_sample_rc.o: ./../sample.rc

        windres --use-temp-file -i$< -o$@   --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
 
 .PHONY: all clean
        windres --use-temp-file -i$< -o$@   --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
 
 .PHONY: all clean

diff --git a/samples/dataview/makefile.vc b/samples/dataview/makefile.vc
index e3574a17c3ba13d8adf074d1289af6ed4d9abde8..dcc6eacaacd87118e4707dbaa3dac76cb81af89b 100644 (file)
--- a/samples/dataview/makefile.vc
+++ b/samples/dataview/makefile.vc
@@ -28,7 +28,7 @@ DATAVIEW_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \
        $(CXXFLAGS)
 DATAVIEW_OBJECTS =  \
        $(OBJS)\dataview_dataview.obj \
        $(CXXFLAGS)
 DATAVIEW_OBJECTS =  \
        $(OBJS)\dataview_dataview.obj \

-       $(OBJS)\dataview_dataview.res
+       $(OBJS)\dataview_sample.res

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


@@ -291,7 +291,7 @@ clean:
        -if exist $(OBJS)\dataview.ilk del $(OBJS)\dataview.ilk
        -if exist $(OBJS)\dataview.pdb del $(OBJS)\dataview.pdb
 
        -if exist $(OBJS)\dataview.ilk del $(OBJS)\dataview.ilk
        -if exist $(OBJS)\dataview.pdb del $(OBJS)\dataview.pdb
 

-$(OBJS)\dataview.exe: $(DATAVIEW_OBJECTS) $(OBJS)\dataview_dataview.res
+$(OBJS)\dataview.exe: $(DATAVIEW_OBJECTS) $(OBJS)\dataview_sample.res

        link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
        $(DATAVIEW_OBJECTS)  $(__WXLIB_ADV_p)  $(__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) $(__UNICOWS_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 odbc32.lib
 <<
        link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
        $(DATAVIEW_OBJECTS)  $(__WXLIB_ADV_p)  $(__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) $(__UNICOWS_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 odbc32.lib
 <<


@@ -299,6 +299,6 @@ $(OBJS)\dataview.exe: $(DATAVIEW_OBJECTS) $(OBJS)\dataview_dataview.res
 $(OBJS)\dataview_dataview.obj: .\dataview.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(DATAVIEW_CXXFLAGS) $**
 
 $(OBJS)\dataview_dataview.obj: .\dataview.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(DATAVIEW_CXXFLAGS) $**
 

-$(OBJS)\dataview_dataview.res: .\dataview.rc
+$(OBJS)\dataview_sample.res: .\..\sample.rc

        rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH $**
 
        rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH $**
 

diff --git a/samples/dataview/makefile.wat b/samples/dataview/makefile.wat
index 24a64c1a27fdcd4e16cb3e93a02132b60ac4b077..36358b849cdb64618e006ca34e609c378c416cb7 100644 (file)
--- a/samples/dataview/makefile.wat
+++ b/samples/dataview/makefile.wat
@@ -238,7 +238,7 @@ clean : .SYMBOLIC
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
        -if exist $(OBJS)\dataview.exe del $(OBJS)\dataview.exe
 
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
        -if exist $(OBJS)\dataview.exe del $(OBJS)\dataview.exe
 

-$(OBJS)\dataview.exe :  $(DATAVIEW_OBJECTS) $(OBJS)\dataview_dataview.res
+$(OBJS)\dataview.exe :  $(DATAVIEW_OBJECTS) $(OBJS)\dataview_sample.res

        @%create $(OBJS)\dataview.lbc
        @%append $(OBJS)\dataview.lbc option quiet
        @%append $(OBJS)\dataview.lbc name $^@
        @%create $(OBJS)\dataview.lbc
        @%append $(OBJS)\dataview.lbc option quiet
        @%append $(OBJS)\dataview.lbc name $^@


@@ -246,13 +246,13 @@ $(OBJS)\dataview.exe :  $(DATAVIEW_OBJECTS) $(OBJS)\dataview_dataview.res
        @%append $(OBJS)\dataview.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(DATAVIEW_OBJECTS)) do @%append $(OBJS)\dataview.lbc file %i
        @for %i in ( $(__WXLIB_ADV_p)  $(__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)  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 odbc32.lib ) do @%append $(OBJS)\dataview.lbc library %i
        @%append $(OBJS)\dataview.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(DATAVIEW_OBJECTS)) do @%append $(OBJS)\dataview.lbc file %i
        @for %i in ( $(__WXLIB_ADV_p)  $(__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)  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 odbc32.lib ) do @%append $(OBJS)\dataview.lbc library %i

-       @%append $(OBJS)\dataview.lbc option resource=$(OBJS)\dataview_dataview.res
+       @%append $(OBJS)\dataview.lbc option resource=$(OBJS)\dataview_sample.res

        @for %i in () do @%append $(OBJS)\dataview.lbc option stack=%i
        wlink @$(OBJS)\dataview.lbc
 
 $(OBJS)\dataview_dataview.obj :  .AUTODEPEND .\dataview.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(DATAVIEW_CXXFLAGS) $<
 
        @for %i in () do @%append $(OBJS)\dataview.lbc option stack=%i
        wlink @$(OBJS)\dataview.lbc
 
 $(OBJS)\dataview_dataview.obj :  .AUTODEPEND .\dataview.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(DATAVIEW_CXXFLAGS) $<
 

-$(OBJS)\dataview_dataview.res :  .AUTODEPEND .\dataview.rc
+$(OBJS)\dataview_sample.res :  .AUTODEPEND .\..\sample.rc

        wrc -q -ad -bt=nt -r -fo=$^@   -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
 
        wrc -q -ad -bt=nt -r -fo=$^@   -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<