version.rc fix regeneration

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

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 4c99fc3edae7e3f2f1fd74e97d3d162816b36448..9d1ae8e5d2bbef7aa8881b04e3236bb7cd583dc0 100644 (file)
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -548,7 +548,7 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
                 $(TOP_SRCDIR)include
             </res-include>
         </if>
-        <win32-res>src/msw/version.rc</win32-res>
+        <win32-res>$(WXTOPDIR)src/msw/version.rc</win32-res>
     </template>
 
     <template id="wx_3rdparty_dependencies_gui" cond="USE_GUI=='1'">

diff --git a/contrib/build/animate/animate.dsp b/contrib/build/animate/animate.dsp
index de0f9c2f7ae4fec5b111a4dc599abb965af6d9e7..0c3a22ef41e85788c7d2eefd97b4a3b66d64069a 100644 (file)
--- a/contrib/build/animate/animate.dsp
+++ b/contrib/build/animate/animate.dsp
@@ -462,7 +462,7 @@ SOURCE=../../src/animate\..\..\..\src\msw\dummy.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../src/animate\src\msw\version.rc
+SOURCE=../../src/animate\..\..\..\src\msw\version.rc
 
 !IF  "$(CFG)" == "animate - Win32 DLL Universal Unicode Release"
 

diff --git a/contrib/build/animate/makefile.bcc b/contrib/build/animate/makefile.bcc
index 6d094faad63ae57881b4c6bcd3e7cf0ea65d2e31..65da4d50d956d430462030796cd9d36511bfeba8 100644 (file)
--- a/contrib/build/animate/makefile.bcc
+++ b/contrib/build/animate/makefile.bcc
@@ -248,7 +248,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 $(OBJS)\animatedll_dummy.obj: ../../src/animate\..\..\..\src\msw\dummy.cpp
        $(CXX) -q -c -P -o$@ $(ANIMATEDLL_CXXFLAGS) -H $**
 
-$(OBJS)\animatedll_version.res: ../../src/animate\src\msw\version.rc
+$(OBJS)\animatedll_version.res: ../../src/animate\..\..\..\src\msw\version.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) -i..\..\src\animate\..\..\..\include -i$(SETUPHDIR) -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_animate_bcc$(VENDORTAG) $**
 
 $(OBJS)\animatedll_animate.obj: ../../src/animate\animate.cpp

diff --git a/contrib/build/animate/makefile.gcc b/contrib/build/animate/makefile.gcc
index 9754bb2f9e07ba6819d6c3e17febd3e7214f89a0..916b0430e73f71febb75f13c5d9541de4efc3990 100644 (file)
--- a/contrib/build/animate/makefile.gcc
+++ b/contrib/build/animate/makefile.gcc
@@ -237,7 +237,7 @@ endif
 $(OBJS)\animatedll_dummy.o: ../../src/animate/../../../src/msw/dummy.cpp
        $(CXX) -c -o $@ $(ANIMATEDLL_CXXFLAGS) $<
 
-$(OBJS)\animatedll_version_rc.o: ../../src/animate/src/msw/version.rc
+$(OBJS)\animatedll_version_rc.o: ../../src/animate/../../../src/msw/version.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) --include-dir ../../src/animate/../../../include --include-dir $(SETUPHDIR) --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_animate_gcc$(VENDORTAG)
 
 $(OBJS)\animatedll_animate.o: ../../src/animate/animate.cpp

diff --git a/contrib/build/animate/makefile.vc b/contrib/build/animate/makefile.vc
index 3d2e5421079d65990aa66fe6efad8f42e0a01d4b..421a3903d6a0f8fa050c98a44a53f920141a01bb 100644 (file)
--- a/contrib/build/animate/makefile.vc
+++ b/contrib/build/animate/makefile.vc
@@ -352,7 +352,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 $(OBJS)\animatedll_dummy.obj: ../../src/animate\..\..\..\src\msw\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(ANIMATEDLL_CXXFLAGS) /Ycwx/wxprec.h $**
 
-$(OBJS)\animatedll_version.res: ../../src/animate\src\msw\version.rc
+$(OBJS)\animatedll_version.res: ../../src/animate\..\..\..\src\msw\version.rc
        rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_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) /i ..\..\src\animate\..\..\..\include /i $(SETUPHDIR) /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_animate_vc$(VENDORTAG) $**
 
 $(OBJS)\animatedll_animate.obj: ../../src/animate\animate.cpp

diff --git a/contrib/build/animate/makefile.wat b/contrib/build/animate/makefile.wat
index d42c2ea295f72ec4934583cec014ef1a9c0dd291..35832e270254386576dafc380b7e56321df512b2 100644 (file)
--- a/contrib/build/animate/makefile.wat
+++ b/contrib/build/animate/makefile.wat
@@ -287,7 +287,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 $(OBJS)\animatedll_dummy.obj :  .AUTODEPEND ../../src/animate\..\..\..\src\msw\dummy.cpp
        $(CXX) -zq -fo=$^@ $(ANIMATEDLL_CXXFLAGS) $<
 
-$(OBJS)\animatedll_version.res :  .AUTODEPEND ../../src/animate\src\msw\version.rc
+$(OBJS)\animatedll_version.res :  .AUTODEPEND ../../src/animate\..\..\..\src\msw\version.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=..\..\src\animate\..\..\..\include -i=$(SETUPHDIR) -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_animate_wat$(VENDORTAG) $<
 
 $(OBJS)\animatedll_animate.obj :  .AUTODEPEND ../../src/animate\animate.cpp

diff --git a/contrib/build/deprecated/deprecated.dsp b/contrib/build/deprecated/deprecated.dsp
index 3779a7edbffd10472b0bb20d701dc176f1f443d8..84d41854c92a8d84df3c520d750dcccb30ab1ea5 100644 (file)
--- a/contrib/build/deprecated/deprecated.dsp
+++ b/contrib/build/deprecated/deprecated.dsp
@@ -487,7 +487,7 @@ SOURCE=../../src/deprecated\treelay.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../src/deprecated\src\msw\version.rc
+SOURCE=../../src/deprecated\..\..\..\src\msw\version.rc
 
 !IF  "$(CFG)" == "deprecated - Win32 DLL Universal Unicode Release"
 

diff --git a/contrib/build/deprecated/makefile.bcc b/contrib/build/deprecated/makefile.bcc
index f91df8ab48451b7ed9166ef6c5ecf4ff25cfaab5..957def3ae1612ddee4977bcdf89dc681deca8506 100644 (file)
--- a/contrib/build/deprecated/makefile.bcc
+++ b/contrib/build/deprecated/makefile.bcc
@@ -277,7 +277,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 $(OBJS)\deprecateddll_dummy.obj: ../../src/deprecated\..\..\..\src\msw\dummy.cpp
        $(CXX) -q -c -P -o$@ $(DEPRECATEDDLL_CXXFLAGS) -H $**
 
-$(OBJS)\deprecateddll_version.res: ../../src/deprecated\src\msw\version.rc
+$(OBJS)\deprecateddll_version.res: ../../src/deprecated\..\..\..\src\msw\version.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) -i..\..\src\deprecated\..\..\..\include -i$(SETUPHDIR) -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_bcc$(VENDORTAG) $**
 
 $(OBJS)\deprecateddll_prop.obj: ../../src/deprecated\prop.cpp

diff --git a/contrib/build/deprecated/makefile.gcc b/contrib/build/deprecated/makefile.gcc
index 8d0be256bc5304304ff572ef43da52418523c419..65191af4cad4c9964f93ffbb923364ddff891272 100644 (file)
--- a/contrib/build/deprecated/makefile.gcc
+++ b/contrib/build/deprecated/makefile.gcc
@@ -265,7 +265,7 @@ endif
 $(OBJS)\deprecateddll_dummy.o: ../../src/deprecated/../../../src/msw/dummy.cpp
        $(CXX) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $<
 
-$(OBJS)\deprecateddll_version_rc.o: ../../src/deprecated/src/msw/version.rc
+$(OBJS)\deprecateddll_version_rc.o: ../../src/deprecated/../../../src/msw/version.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) --include-dir ../../src/deprecated/../../../include --include-dir $(SETUPHDIR) --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_gcc$(VENDORTAG)
 
 $(OBJS)\deprecateddll_prop.o: ../../src/deprecated/prop.cpp

diff --git a/contrib/build/deprecated/makefile.vc b/contrib/build/deprecated/makefile.vc
index cf6e51d7d8211cbb8618999476648126f3b2b267..a898a4c1583c9d001593a62d0f3c796ae1eff5d4 100644 (file)
--- a/contrib/build/deprecated/makefile.vc
+++ b/contrib/build/deprecated/makefile.vc
@@ -385,7 +385,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 $(OBJS)\deprecateddll_dummy.obj: ../../src/deprecated\..\..\..\src\msw\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDDLL_CXXFLAGS) /Ycwx/wxprec.h $**
 
-$(OBJS)\deprecateddll_version.res: ../../src/deprecated\src\msw\version.rc
+$(OBJS)\deprecateddll_version.res: ../../src/deprecated\..\..\..\src\msw\version.rc
        rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_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) /i ..\..\src\deprecated\..\..\..\include /i $(SETUPHDIR) /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_vc$(VENDORTAG) $**
 
 $(OBJS)\deprecateddll_prop.obj: ../../src/deprecated\prop.cpp

diff --git a/contrib/build/deprecated/makefile.wat b/contrib/build/deprecated/makefile.wat
index 744635d8d258f79c6939ad5265e447782594f199..32cd688630acac3e2992d3fcbf3fb62799785a68 100644 (file)
--- a/contrib/build/deprecated/makefile.wat
+++ b/contrib/build/deprecated/makefile.wat
@@ -317,7 +317,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 $(OBJS)\deprecateddll_dummy.obj :  .AUTODEPEND ../../src/deprecated\..\..\..\src\msw\dummy.cpp
        $(CXX) -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $<
 
-$(OBJS)\deprecateddll_version.res :  .AUTODEPEND ../../src/deprecated\src\msw\version.rc
+$(OBJS)\deprecateddll_version.res :  .AUTODEPEND ../../src/deprecated\..\..\..\src\msw\version.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=..\..\src\deprecated\..\..\..\include -i=$(SETUPHDIR) -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_wat$(VENDORTAG) $<
 
 $(OBJS)\deprecateddll_prop.obj :  .AUTODEPEND ../../src/deprecated\prop.cpp

diff --git a/contrib/build/fl/fl.dsp b/contrib/build/fl/fl.dsp
index 21fd07c619ef2d3835b53770d60322cb1b9021f3..67d2dd115e0265cd86015f6968ca3c179d6eee72 100644 (file)
--- a/contrib/build/fl/fl.dsp
+++ b/contrib/build/fl/fl.dsp
@@ -526,7 +526,7 @@ SOURCE=../../src/fl\updatesmgr.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../src/fl\src\msw\version.rc
+SOURCE=../../src/fl\..\..\..\src\msw\version.rc
 
 !IF  "$(CFG)" == "fl - Win32 DLL Universal Unicode Release"
 

diff --git a/contrib/build/fl/makefile.bcc b/contrib/build/fl/makefile.bcc
index 88a63bf6b7eb044e8fe367b710e1a2f0663607b1..be7f8fe03df188247230b4575b83ebfa98a94a52 100644 (file)
--- a/contrib/build/fl/makefile.bcc
+++ b/contrib/build/fl/makefile.bcc
@@ -278,7 +278,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 $(OBJS)\fldll_dummy.obj: ../../src/fl\..\..\..\src\msw\dummy.cpp
        $(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) -H $**
 
-$(OBJS)\fldll_version.res: ../../src/fl\src\msw\version.rc
+$(OBJS)\fldll_version.res: ../../src/fl\..\..\..\src\msw\version.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) -i..\..\src\fl\..\..\..\include -i$(SETUPHDIR) -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_bcc$(VENDORTAG) $**
 
 $(OBJS)\fldll_antiflickpl.obj: ../../src/fl\antiflickpl.cpp

diff --git a/contrib/build/fl/makefile.gcc b/contrib/build/fl/makefile.gcc
index db64acbcf0acd6272765362d621c64f0239abd35..f7cc135d6d9d15ce1d90ca1b8d1c72e80627ed7e 100644 (file)
--- a/contrib/build/fl/makefile.gcc
+++ b/contrib/build/fl/makefile.gcc
@@ -267,7 +267,7 @@ endif
 $(OBJS)\fldll_dummy.o: ../../src/fl/../../../src/msw/dummy.cpp
        $(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $<
 
-$(OBJS)\fldll_version_rc.o: ../../src/fl/src/msw/version.rc
+$(OBJS)\fldll_version_rc.o: ../../src/fl/../../../src/msw/version.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) --include-dir ../../src/fl/../../../include --include-dir $(SETUPHDIR) --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_gcc$(VENDORTAG)
 
 $(OBJS)\fldll_antiflickpl.o: ../../src/fl/antiflickpl.cpp

diff --git a/contrib/build/fl/makefile.vc b/contrib/build/fl/makefile.vc
index 18278da134ef74cf092489ef0d7669a2bc37cc69..9108680ad3b547cabc8afbce191fb2f36a281a64 100644 (file)
--- a/contrib/build/fl/makefile.vc
+++ b/contrib/build/fl/makefile.vc
@@ -384,7 +384,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 $(OBJS)\fldll_dummy.obj: ../../src/fl\..\..\..\src\msw\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) /Ycwx/wxprec.h $**
 
-$(OBJS)\fldll_version.res: ../../src/fl\src\msw\version.rc
+$(OBJS)\fldll_version.res: ../../src/fl\..\..\..\src\msw\version.rc
        rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_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) /i ..\..\src\fl\..\..\..\include /i $(SETUPHDIR) /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_vc$(VENDORTAG) $**
 
 $(OBJS)\fldll_antiflickpl.obj: ../../src/fl\antiflickpl.cpp

diff --git a/contrib/build/fl/makefile.wat b/contrib/build/fl/makefile.wat
index 2a3f7eb63fe858c388c7029cc7ddc37a4a04d031..9d3f30416ccf668d528d294ed882f930f60b2ccf 100644 (file)
--- a/contrib/build/fl/makefile.wat
+++ b/contrib/build/fl/makefile.wat
@@ -318,7 +318,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 $(OBJS)\fldll_dummy.obj :  .AUTODEPEND ../../src/fl\..\..\..\src\msw\dummy.cpp
        $(CXX) -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
 
-$(OBJS)\fldll_version.res :  .AUTODEPEND ../../src/fl\src\msw\version.rc
+$(OBJS)\fldll_version.res :  .AUTODEPEND ../../src/fl\..\..\..\src\msw\version.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=..\..\src\fl\..\..\..\include -i=$(SETUPHDIR) -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_wat$(VENDORTAG) $<
 
 $(OBJS)\fldll_antiflickpl.obj :  .AUTODEPEND ../../src/fl\antiflickpl.cpp

diff --git a/contrib/build/foldbar/foldbar.dsp b/contrib/build/foldbar/foldbar.dsp
index 49250f51f161c140520784ff650b791cd608824d..89079c69b8da89e06794d561583bb0f2deb5b194 100644 (file)
--- a/contrib/build/foldbar/foldbar.dsp
+++ b/contrib/build/foldbar/foldbar.dsp
@@ -470,7 +470,7 @@ SOURCE=../../src/foldbar\foldpanelitem.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../src/foldbar\src\msw\version.rc
+SOURCE=../../src/foldbar\..\..\..\src\msw\version.rc
 
 !IF  "$(CFG)" == "foldbar - Win32 DLL Universal Unicode Release"
 

diff --git a/contrib/build/foldbar/makefile.bcc b/contrib/build/foldbar/makefile.bcc
index 9a92d8a1dbd83f787b8a50ea97912640653852a6..2337ceb6d2869d244974421d1b921cc9f1a9a54f 100644 (file)
--- a/contrib/build/foldbar/makefile.bcc
+++ b/contrib/build/foldbar/makefile.bcc
@@ -252,7 +252,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 $(OBJS)\foldbardll_dummy.obj: ../../src/foldbar\..\..\..\src\msw\dummy.cpp
        $(CXX) -q -c -P -o$@ $(FOLDBARDLL_CXXFLAGS) -H $**
 
-$(OBJS)\foldbardll_version.res: ../../src/foldbar\src\msw\version.rc
+$(OBJS)\foldbardll_version.res: ../../src/foldbar\..\..\..\src\msw\version.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) -i..\..\src\foldbar\..\..\..\include -i$(SETUPHDIR) -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_bcc$(VENDORTAG) $**
 
 $(OBJS)\foldbardll_captionbar.obj: ../../src/foldbar\captionbar.cpp

diff --git a/contrib/build/foldbar/makefile.gcc b/contrib/build/foldbar/makefile.gcc
index 5718463094004d6d35f10abb6250d88769ac592f..917b20fe1c3392ec0c8c8e36ea7e96abbcc38d09 100644 (file)
--- a/contrib/build/foldbar/makefile.gcc
+++ b/contrib/build/foldbar/makefile.gcc
@@ -241,7 +241,7 @@ endif
 $(OBJS)\foldbardll_dummy.o: ../../src/foldbar/../../../src/msw/dummy.cpp
        $(CXX) -c -o $@ $(FOLDBARDLL_CXXFLAGS) $<
 
-$(OBJS)\foldbardll_version_rc.o: ../../src/foldbar/src/msw/version.rc
+$(OBJS)\foldbardll_version_rc.o: ../../src/foldbar/../../../src/msw/version.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) --include-dir ../../src/foldbar/../../../include --include-dir $(SETUPHDIR) --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_gcc$(VENDORTAG)
 
 $(OBJS)\foldbardll_captionbar.o: ../../src/foldbar/captionbar.cpp

diff --git a/contrib/build/foldbar/makefile.vc b/contrib/build/foldbar/makefile.vc
index f7aa4e97d28960662ba46925b11c068eca48933a..aa2617ee5bda6d747f04dec8f0a2a91bfb742d5d 100644 (file)
--- a/contrib/build/foldbar/makefile.vc
+++ b/contrib/build/foldbar/makefile.vc
@@ -356,7 +356,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 $(OBJS)\foldbardll_dummy.obj: ../../src/foldbar\..\..\..\src\msw\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(FOLDBARDLL_CXXFLAGS) /Ycwx/wxprec.h $**
 
-$(OBJS)\foldbardll_version.res: ../../src/foldbar\src\msw\version.rc
+$(OBJS)\foldbardll_version.res: ../../src/foldbar\..\..\..\src\msw\version.rc
        rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_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) /i ..\..\src\foldbar\..\..\..\include /i $(SETUPHDIR) /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_vc$(VENDORTAG) $**
 
 $(OBJS)\foldbardll_captionbar.obj: ../../src/foldbar\captionbar.cpp

diff --git a/contrib/build/foldbar/makefile.wat b/contrib/build/foldbar/makefile.wat
index 35430e7b3315cc5970208ad8da6db40149209e8c..6885bba6942f5d48f6433e645bb147dd5d8777c8 100644 (file)
--- a/contrib/build/foldbar/makefile.wat
+++ b/contrib/build/foldbar/makefile.wat
@@ -291,7 +291,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 $(OBJS)\foldbardll_dummy.obj :  .AUTODEPEND ../../src/foldbar\..\..\..\src\msw\dummy.cpp
        $(CXX) -zq -fo=$^@ $(FOLDBARDLL_CXXFLAGS) $<
 
-$(OBJS)\foldbardll_version.res :  .AUTODEPEND ../../src/foldbar\src\msw\version.rc
+$(OBJS)\foldbardll_version.res :  .AUTODEPEND ../../src/foldbar\..\..\..\src\msw\version.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=..\..\src\foldbar\..\..\..\include -i=$(SETUPHDIR) -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_wat$(VENDORTAG) $<
 
 $(OBJS)\foldbardll_captionbar.obj :  .AUTODEPEND ../../src/foldbar\captionbar.cpp

diff --git a/contrib/build/gizmos/gizmos.dsp b/contrib/build/gizmos/gizmos.dsp
index 8549a4dced1eff751d19214197c0cfe4c926c6e2..69a0e293f8e336bfbb4128127d86db8232e00976 100644 (file)
--- a/contrib/build/gizmos/gizmos.dsp
+++ b/contrib/build/gizmos/gizmos.dsp
@@ -482,7 +482,7 @@ SOURCE=../../src/gizmos\statpict.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../src/gizmos\src\msw\version.rc
+SOURCE=../../src/gizmos\..\..\..\src\msw\version.rc
 
 !IF  "$(CFG)" == "gizmos - Win32 DLL Universal Unicode Release"
 

diff --git a/contrib/build/gizmos/makefile.bcc b/contrib/build/gizmos/makefile.bcc
index f49d849ee7adcd980866fb7acb200f2ce727ba02..410457d4ce2b1ca1d8ee31986304c4a4cfcddf66 100644 (file)
--- a/contrib/build/gizmos/makefile.bcc
+++ b/contrib/build/gizmos/makefile.bcc
@@ -258,7 +258,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 $(OBJS)\gizmosdll_dummy.obj: ../../src/gizmos\..\..\..\src\msw\dummy.cpp
        $(CXX) -q -c -P -o$@ $(GIZMOSDLL_CXXFLAGS) -H $**
 
-$(OBJS)\gizmosdll_version.res: ../../src/gizmos\src\msw\version.rc
+$(OBJS)\gizmosdll_version.res: ../../src/gizmos\..\..\..\src\msw\version.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) -i..\..\src\gizmos\..\..\..\include -i$(SETUPHDIR) -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_bcc$(VENDORTAG) $**
 
 $(OBJS)\gizmosdll_dynamicsash.obj: ../../src/gizmos\dynamicsash.cpp

diff --git a/contrib/build/gizmos/makefile.gcc b/contrib/build/gizmos/makefile.gcc
index 5330b9e5e5974b9706956a2017db77323ee0a334..7822196734d5583c80327024a6aa5f22462eb13d 100644 (file)
--- a/contrib/build/gizmos/makefile.gcc
+++ b/contrib/build/gizmos/makefile.gcc
@@ -247,7 +247,7 @@ endif
 $(OBJS)\gizmosdll_dummy.o: ../../src/gizmos/../../../src/msw/dummy.cpp
        $(CXX) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $<
 
-$(OBJS)\gizmosdll_version_rc.o: ../../src/gizmos/src/msw/version.rc
+$(OBJS)\gizmosdll_version_rc.o: ../../src/gizmos/../../../src/msw/version.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) --include-dir ../../src/gizmos/../../../include --include-dir $(SETUPHDIR) --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_gcc$(VENDORTAG)
 
 $(OBJS)\gizmosdll_dynamicsash.o: ../../src/gizmos/dynamicsash.cpp

diff --git a/contrib/build/gizmos/makefile.vc b/contrib/build/gizmos/makefile.vc
index d6a8c6dfc3fa08c361c5304a7d1c3a1c45cf1c10..ef2dd91c6eff4bf564bc46419cd2fd18bf75583d 100644 (file)
--- a/contrib/build/gizmos/makefile.vc
+++ b/contrib/build/gizmos/makefile.vc
@@ -362,7 +362,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 $(OBJS)\gizmosdll_dummy.obj: ../../src/gizmos\..\..\..\src\msw\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(GIZMOSDLL_CXXFLAGS) /Ycwx/wxprec.h $**
 
-$(OBJS)\gizmosdll_version.res: ../../src/gizmos\src\msw\version.rc
+$(OBJS)\gizmosdll_version.res: ../../src/gizmos\..\..\..\src\msw\version.rc
        rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_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) /i ..\..\src\gizmos\..\..\..\include /i $(SETUPHDIR) /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_vc$(VENDORTAG) $**
 
 $(OBJS)\gizmosdll_dynamicsash.obj: ../../src/gizmos\dynamicsash.cpp

diff --git a/contrib/build/gizmos/makefile.wat b/contrib/build/gizmos/makefile.wat
index ad87c8d3403ce1b4f4cb86636abda066a9b5b053..32aa9a8c8a4854c2688d276c6876c35bd99329fe 100644 (file)
--- a/contrib/build/gizmos/makefile.wat
+++ b/contrib/build/gizmos/makefile.wat
@@ -296,7 +296,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 $(OBJS)\gizmosdll_dummy.obj :  .AUTODEPEND ../../src/gizmos\..\..\..\src\msw\dummy.cpp
        $(CXX) -zq -fo=$^@ $(GIZMOSDLL_CXXFLAGS) $<
 
-$(OBJS)\gizmosdll_version.res :  .AUTODEPEND ../../src/gizmos\src\msw\version.rc
+$(OBJS)\gizmosdll_version.res :  .AUTODEPEND ../../src/gizmos\..\..\..\src\msw\version.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=..\..\src\gizmos\..\..\..\include -i=$(SETUPHDIR) -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_wat$(VENDORTAG) $<
 
 $(OBJS)\gizmosdll_dynamicsash.obj :  .AUTODEPEND ../../src/gizmos\dynamicsash.cpp

diff --git a/contrib/build/mmedia/makefile.bcc b/contrib/build/mmedia/makefile.bcc
index 68289184a81770cac37303b41883302a3c7b2a39..df728b278917478b5610f460ee736ba079151f0f 100644 (file)
--- a/contrib/build/mmedia/makefile.bcc
+++ b/contrib/build/mmedia/makefile.bcc
@@ -286,7 +286,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 $(OBJS)\mmediadll_dummy.obj: ../../src/mmedia\..\..\..\src\msw\dummy.cpp
        $(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) -H $**
 
-$(OBJS)\mmediadll_version.res: ../../src/mmedia\src\msw\version.rc
+$(OBJS)\mmediadll_version.res: ../../src/mmedia\..\..\..\src\msw\version.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) -i..\..\src\mmedia\..\..\..\include -i$(SETUPHDIR) -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia_bcc$(VENDORTAG) $**
 
 $(OBJS)\mmediadll_cdwin.obj: ../../src/mmedia\cdwin.cpp

diff --git a/contrib/build/mmedia/makefile.gcc b/contrib/build/mmedia/makefile.gcc
index a6ecffd91b3fab5bb7a5bbcb3533fc5d7d3e1bb1..04ee21ac3cd2ba987d5627d3b195ee298d73a3d5 100644 (file)
--- a/contrib/build/mmedia/makefile.gcc
+++ b/contrib/build/mmedia/makefile.gcc
@@ -275,7 +275,7 @@ endif
 $(OBJS)\mmediadll_dummy.o: ../../src/mmedia/../../../src/msw/dummy.cpp
        $(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
 
-$(OBJS)\mmediadll_version_rc.o: ../../src/mmedia/src/msw/version.rc
+$(OBJS)\mmediadll_version_rc.o: ../../src/mmedia/../../../src/msw/version.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) --include-dir ../../src/mmedia/../../../include --include-dir $(SETUPHDIR) --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia_gcc$(VENDORTAG)
 
 $(OBJS)\mmediadll_cdwin.o: ../../src/mmedia/cdwin.cpp

diff --git a/contrib/build/mmedia/makefile.vc b/contrib/build/mmedia/makefile.vc
index 8343612c54c09b830acd56d73470d7942df39993..adc020c54e3c351450c886276e60d34392fa92fc 100644 (file)
--- a/contrib/build/mmedia/makefile.vc
+++ b/contrib/build/mmedia/makefile.vc
@@ -390,7 +390,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 $(OBJS)\mmediadll_dummy.obj: ../../src/mmedia\..\..\..\src\msw\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) /Ycwx/wxprec.h $**
 
-$(OBJS)\mmediadll_version.res: ../../src/mmedia\src\msw\version.rc
+$(OBJS)\mmediadll_version.res: ../../src/mmedia\..\..\..\src\msw\version.rc
        rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_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) /i ..\..\src\mmedia\..\..\..\include /i $(SETUPHDIR) /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia_vc$(VENDORTAG) $**
 
 $(OBJS)\mmediadll_cdwin.obj: ../../src/mmedia\cdwin.cpp

diff --git a/contrib/build/mmedia/makefile.wat b/contrib/build/mmedia/makefile.wat
index 7ec1eba34a7561e61280d4279284afff2739f8b0..8af81823a2e1ddd22c7c68f2317902747d4b0967 100644 (file)
--- a/contrib/build/mmedia/makefile.wat
+++ b/contrib/build/mmedia/makefile.wat
@@ -324,7 +324,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 $(OBJS)\mmediadll_dummy.obj :  .AUTODEPEND ../../src/mmedia\..\..\..\src\msw\dummy.cpp
        $(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
 
-$(OBJS)\mmediadll_version.res :  .AUTODEPEND ../../src/mmedia\src\msw\version.rc
+$(OBJS)\mmediadll_version.res :  .AUTODEPEND ../../src/mmedia\..\..\..\src\msw\version.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=..\..\src\mmedia\..\..\..\include -i=$(SETUPHDIR) -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia_wat$(VENDORTAG) $<
 
 $(OBJS)\mmediadll_cdwin.obj :  .AUTODEPEND ../../src/mmedia\cdwin.cpp

diff --git a/contrib/build/mmedia/mmedia.dsp b/contrib/build/mmedia/mmedia.dsp
index 3cce8e0165bb2125900bc16c01c92e5e6e13d8f0..432fb60f1f1b9bb7ea8164872fd178212624157e 100644 (file)
--- a/contrib/build/mmedia/mmedia.dsp
+++ b/contrib/build/mmedia/mmedia.dsp
@@ -530,7 +530,7 @@ SOURCE=../../src/mmedia\sndwin.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../src/mmedia\src\msw\version.rc
+SOURCE=../../src/mmedia\..\..\..\src\msw\version.rc
 
 !IF  "$(CFG)" == "mmedia - Win32 DLL Universal Unicode Release"
 

diff --git a/contrib/build/net/makefile.bcc b/contrib/build/net/makefile.bcc
index 78a91dab20809bb4cd57c14d0cce3f1f3fc3e363..670c3b47207d265f17f7932f67824d81b667c280 100644 (file)
--- a/contrib/build/net/makefile.bcc
+++ b/contrib/build/net/makefile.bcc
@@ -252,7 +252,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 $(OBJS)\netutilsdll_dummy.obj: ../../src/net\..\..\..\src\msw\dummy.cpp
        $(CXX) -q -c -P -o$@ $(NETUTILSDLL_CXXFLAGS) -H $**
 
-$(OBJS)\netutilsdll_version.res: ../../src/net\src\msw\version.rc
+$(OBJS)\netutilsdll_version.res: ../../src/net\..\..\..\src\msw\version.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) -i..\..\src\net\..\..\..\include -i$(SETUPHDIR) -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_bcc$(VENDORTAG) $**
 
 $(OBJS)\netutilsdll_email.obj: ../../src/net\email.cpp

diff --git a/contrib/build/net/makefile.gcc b/contrib/build/net/makefile.gcc
index 817a551d59e448037d7b17623331d81959256d9e..fb50a100d204243f093eeb3577c813d3369f57fa 100644 (file)
--- a/contrib/build/net/makefile.gcc
+++ b/contrib/build/net/makefile.gcc
@@ -241,7 +241,7 @@ endif
 $(OBJS)\netutilsdll_dummy.o: ../../src/net/../../../src/msw/dummy.cpp
        $(CXX) -c -o $@ $(NETUTILSDLL_CXXFLAGS) $<
 
-$(OBJS)\netutilsdll_version_rc.o: ../../src/net/src/msw/version.rc
+$(OBJS)\netutilsdll_version_rc.o: ../../src/net/../../../src/msw/version.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) --include-dir ../../src/net/../../../include --include-dir $(SETUPHDIR) --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_gcc$(VENDORTAG)
 
 $(OBJS)\netutilsdll_email.o: ../../src/net/email.cpp

diff --git a/contrib/build/net/makefile.vc b/contrib/build/net/makefile.vc
index 5c9f524e237a38838647394055b1fa5eb0daa8c4..73823143243336feddab6e501dd232957416e731 100644 (file)
--- a/contrib/build/net/makefile.vc
+++ b/contrib/build/net/makefile.vc
@@ -357,7 +357,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 $(OBJS)\netutilsdll_dummy.obj: ../../src/net\..\..\..\src\msw\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(NETUTILSDLL_CXXFLAGS) /Ycwx/wxprec.h $**
 
-$(OBJS)\netutilsdll_version.res: ../../src/net\src\msw\version.rc
+$(OBJS)\netutilsdll_version.res: ../../src/net\..\..\..\src\msw\version.rc
        rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_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) /i ..\..\src\net\..\..\..\include /i $(SETUPHDIR) /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_vc$(VENDORTAG) $**
 
 $(OBJS)\netutilsdll_email.obj: ../../src/net\email.cpp

diff --git a/contrib/build/net/makefile.wat b/contrib/build/net/makefile.wat
index c6a4ab0fce6e8aa4bb2731a7a3609b43a712bd55..5463777766cf8f1f33eab923ccf94ab419a1ecf8 100644 (file)
--- a/contrib/build/net/makefile.wat
+++ b/contrib/build/net/makefile.wat
@@ -290,7 +290,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 $(OBJS)\netutilsdll_dummy.obj :  .AUTODEPEND ../../src/net\..\..\..\src\msw\dummy.cpp
        $(CXX) -zq -fo=$^@ $(NETUTILSDLL_CXXFLAGS) $<
 
-$(OBJS)\netutilsdll_version.res :  .AUTODEPEND ../../src/net\src\msw\version.rc
+$(OBJS)\netutilsdll_version.res :  .AUTODEPEND ../../src/net\..\..\..\src\msw\version.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=..\..\src\net\..\..\..\include -i=$(SETUPHDIR) -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_wat$(VENDORTAG) $<
 
 $(OBJS)\netutilsdll_email.obj :  .AUTODEPEND ../../src/net\email.cpp

diff --git a/contrib/build/net/net.dsp b/contrib/build/net/net.dsp
index 029901b24ff5e91beb53c4999b89068218642284..34b1c18a4907160efcb7eb99fdd710e5115c0de7 100644 (file)
--- a/contrib/build/net/net.dsp
+++ b/contrib/build/net/net.dsp
@@ -466,7 +466,7 @@ SOURCE=../../src/net\smapi.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../src/net\src\msw\version.rc
+SOURCE=../../src/net\..\..\..\src\msw\version.rc
 
 !IF  "$(CFG)" == "netutils - Win32 DLL Universal Unicode Release"
 

diff --git a/contrib/build/ogl/makefile.bcc b/contrib/build/ogl/makefile.bcc
index f05e00a2840c7a5b2ca01e479362f3304a6b4584..254516cda11a51ef7be93c21b657a02c05ba19eb 100644 (file)
--- a/contrib/build/ogl/makefile.bcc
+++ b/contrib/build/ogl/makefile.bcc
@@ -270,7 +270,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 $(OBJS)\ogldll_dummy.obj: ../../src/ogl\..\..\..\src\msw\dummy.cpp
        $(CXX) -q -c -P -o$@ $(OGLDLL_CXXFLAGS) -H $**
 
-$(OBJS)\ogldll_version.res: ../../src/ogl\src\msw\version.rc
+$(OBJS)\ogldll_version.res: ../../src/ogl\..\..\..\src\msw\version.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) -i..\..\src\ogl\..\..\..\include -i$(SETUPHDIR) -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_bcc$(VENDORTAG) $**
 
 $(OBJS)\ogldll_basic2.obj: ../../src/ogl\basic2.cpp

diff --git a/contrib/build/ogl/makefile.gcc b/contrib/build/ogl/makefile.gcc
index 993d7e13115dfca9d58fb938e0fd8ade202a26e4..62e2cbc050f56bf9fb4aeb18cf3206358ef264fd 100644 (file)
--- a/contrib/build/ogl/makefile.gcc
+++ b/contrib/build/ogl/makefile.gcc
@@ -257,7 +257,7 @@ endif
 $(OBJS)\ogldll_dummy.o: ../../src/ogl/../../../src/msw/dummy.cpp
        $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
 
-$(OBJS)\ogldll_version_rc.o: ../../src/ogl/src/msw/version.rc
+$(OBJS)\ogldll_version_rc.o: ../../src/ogl/../../../src/msw/version.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) --include-dir ../../src/ogl/../../../include --include-dir $(SETUPHDIR) --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_gcc$(VENDORTAG)
 
 $(OBJS)\ogldll_basic2.o: ../../src/ogl/basic2.cpp

diff --git a/contrib/build/ogl/makefile.vc b/contrib/build/ogl/makefile.vc
index d172a0486e7a34306b10bb6ea87003c38aaebc47..7b1707226a11d671930dbf06b358674d98d2f192 100644 (file)
--- a/contrib/build/ogl/makefile.vc
+++ b/contrib/build/ogl/makefile.vc
@@ -374,7 +374,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 $(OBJS)\ogldll_dummy.obj: ../../src/ogl\..\..\..\src\msw\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(OGLDLL_CXXFLAGS) /Ycwx/wxprec.h $**
 
-$(OBJS)\ogldll_version.res: ../../src/ogl\src\msw\version.rc
+$(OBJS)\ogldll_version.res: ../../src/ogl\..\..\..\src\msw\version.rc
        rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_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) /i ..\..\src\ogl\..\..\..\include /i $(SETUPHDIR) /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_vc$(VENDORTAG) $**
 
 $(OBJS)\ogldll_basic2.obj: ../../src/ogl\basic2.cpp

diff --git a/contrib/build/ogl/makefile.wat b/contrib/build/ogl/makefile.wat
index c77d499cb7f82023253a896bc887cb11f96b4cd8..09d9a01cca67812e6fd788da0ff0e63ebe9fb993 100644 (file)
--- a/contrib/build/ogl/makefile.wat
+++ b/contrib/build/ogl/makefile.wat
@@ -308,7 +308,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 $(OBJS)\ogldll_dummy.obj :  .AUTODEPEND ../../src/ogl\..\..\..\src\msw\dummy.cpp
        $(CXX) -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
 
-$(OBJS)\ogldll_version.res :  .AUTODEPEND ../../src/ogl\src\msw\version.rc
+$(OBJS)\ogldll_version.res :  .AUTODEPEND ../../src/ogl\..\..\..\src\msw\version.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=..\..\src\ogl\..\..\..\include -i=$(SETUPHDIR) -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_wat$(VENDORTAG) $<
 
 $(OBJS)\ogldll_basic2.obj :  .AUTODEPEND ../../src/ogl\basic2.cpp

diff --git a/contrib/build/ogl/ogl.dsp b/contrib/build/ogl/ogl.dsp
index c4ca24b7b0925b59724075b7842d243810063955..2ed57d1f84b109886d2c1c63842cd6dac2374b35 100644 (file)
--- a/contrib/build/ogl/ogl.dsp
+++ b/contrib/build/ogl/ogl.dsp
@@ -506,7 +506,7 @@ SOURCE=../../src/ogl\oglmisc.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../src/ogl\src\msw\version.rc
+SOURCE=../../src/ogl\..\..\..\src\msw\version.rc
 
 !IF  "$(CFG)" == "ogl - Win32 DLL Universal Unicode Release"
 

diff --git a/contrib/build/plot/makefile.bcc b/contrib/build/plot/makefile.bcc
index 42cbd77b5d503801007a3a8a910e21c10c83de3d..2ecedc883bf5aa60d2abd7a1963616f595249f3a 100644 (file)
--- a/contrib/build/plot/makefile.bcc
+++ b/contrib/build/plot/makefile.bcc
@@ -248,7 +248,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 $(OBJS)\plotdll_dummy.obj: ../../src/plot\..\..\..\src\msw\dummy.cpp
        $(CXX) -q -c -P -o$@ $(PLOTDLL_CXXFLAGS) -H $**
 
-$(OBJS)\plotdll_version.res: ../../src/plot\src\msw\version.rc
+$(OBJS)\plotdll_version.res: ../../src/plot\..\..\..\src\msw\version.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) -i..\..\src\plot\..\..\..\include -i$(SETUPHDIR) -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_bcc$(VENDORTAG) $**
 
 $(OBJS)\plotdll_plot.obj: ../../src/plot\plot.cpp

diff --git a/contrib/build/plot/makefile.gcc b/contrib/build/plot/makefile.gcc
index 391bbf0557f23e88fdaff9564fd05f7629bcdee9..d7b4d88810c291a9b58972de626a84053c1cb515 100644 (file)
--- a/contrib/build/plot/makefile.gcc
+++ b/contrib/build/plot/makefile.gcc
@@ -237,7 +237,7 @@ endif
 $(OBJS)\plotdll_dummy.o: ../../src/plot/../../../src/msw/dummy.cpp
        $(CXX) -c -o $@ $(PLOTDLL_CXXFLAGS) $<
 
-$(OBJS)\plotdll_version_rc.o: ../../src/plot/src/msw/version.rc
+$(OBJS)\plotdll_version_rc.o: ../../src/plot/../../../src/msw/version.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) --include-dir ../../src/plot/../../../include --include-dir $(SETUPHDIR) --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_gcc$(VENDORTAG)
 
 $(OBJS)\plotdll_plot.o: ../../src/plot/plot.cpp

diff --git a/contrib/build/plot/makefile.vc b/contrib/build/plot/makefile.vc
index a2f6b618aaf08cd1dde96edec43175ee1df3588b..042efbdb715a17ed017da759edc63df73de48eeb 100644 (file)
--- a/contrib/build/plot/makefile.vc
+++ b/contrib/build/plot/makefile.vc
@@ -352,7 +352,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 $(OBJS)\plotdll_dummy.obj: ../../src/plot\..\..\..\src\msw\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(PLOTDLL_CXXFLAGS) /Ycwx/wxprec.h $**
 
-$(OBJS)\plotdll_version.res: ../../src/plot\src\msw\version.rc
+$(OBJS)\plotdll_version.res: ../../src/plot\..\..\..\src\msw\version.rc
        rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_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) /i ..\..\src\plot\..\..\..\include /i $(SETUPHDIR) /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_vc$(VENDORTAG) $**
 
 $(OBJS)\plotdll_plot.obj: ../../src/plot\plot.cpp

diff --git a/contrib/build/plot/makefile.wat b/contrib/build/plot/makefile.wat
index 63342ac57718001f79c55a1812f8bf8ed50a4c43..8e9867c96f80a147c6c00c35b414be554b0d05ab 100644 (file)
--- a/contrib/build/plot/makefile.wat
+++ b/contrib/build/plot/makefile.wat
@@ -286,7 +286,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 $(OBJS)\plotdll_dummy.obj :  .AUTODEPEND ../../src/plot\..\..\..\src\msw\dummy.cpp
        $(CXX) -zq -fo=$^@ $(PLOTDLL_CXXFLAGS) $<
 
-$(OBJS)\plotdll_version.res :  .AUTODEPEND ../../src/plot\src\msw\version.rc
+$(OBJS)\plotdll_version.res :  .AUTODEPEND ../../src/plot\..\..\..\src\msw\version.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=..\..\src\plot\..\..\..\include -i=$(SETUPHDIR) -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_wat$(VENDORTAG) $<
 
 $(OBJS)\plotdll_plot.obj :  .AUTODEPEND ../../src/plot\plot.cpp

diff --git a/contrib/build/plot/plot.dsp b/contrib/build/plot/plot.dsp
index c299f0072d4d4199c0cfd8f91f83d4ec44eef496..6cfe36f583f6b9aec6fee988ddc32f85daf5a870 100644 (file)
--- a/contrib/build/plot/plot.dsp
+++ b/contrib/build/plot/plot.dsp
@@ -462,7 +462,7 @@ SOURCE=../../src/plot\plot.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../src/plot\src\msw\version.rc
+SOURCE=../../src/plot\..\..\..\src\msw\version.rc
 
 !IF  "$(CFG)" == "plot - Win32 DLL Universal Unicode Release"
 

diff --git a/contrib/build/stc/makefile.bcc b/contrib/build/stc/makefile.bcc
index 62606f455449960145e2a54f93ea6025483e8204..620be1926a19338d372f4082ab9172f0e8f7a352 100644 (file)
--- a/contrib/build/stc/makefile.bcc
+++ b/contrib/build/stc/makefile.bcc
@@ -385,7 +385,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 |
 !endif
 
-$(OBJS)\stcdll_version.res: ../../src/stc\src\msw\version.rc
+$(OBJS)\stcdll_version.res: ../../src/stc\..\..\..\src\msw\version.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) -i..\..\src\stc\..\..\..\include -i$(SETUPHDIR) -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_bcc$(VENDORTAG) $**
 
 $(OBJS)\stcdll_PlatWX.obj: ../../src/stc\PlatWX.cpp

diff --git a/contrib/build/stc/makefile.gcc b/contrib/build/stc/makefile.gcc
index a48496eea404f0b9d4dce503be5b5379ce9ac9d1..beada0e42ce032342d7c15e20ff363b67fee7ac1 100644 (file)
--- a/contrib/build/stc/makefile.gcc
+++ b/contrib/build/stc/makefile.gcc
@@ -373,7 +373,7 @@ $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(
        ranlib $@
 endif
 
-$(OBJS)\stcdll_version_rc.o: ../../src/stc/src/msw/version.rc
+$(OBJS)\stcdll_version_rc.o: ../../src/stc/../../../src/msw/version.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) --include-dir ../../src/stc/../../../include --include-dir $(SETUPHDIR) --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_gcc$(VENDORTAG)
 
 $(OBJS)\stcdll_PlatWX.o: ../../src/stc/PlatWX.cpp

diff --git a/contrib/build/stc/makefile.vc b/contrib/build/stc/makefile.vc
index 2bfdb5771ff2e8155e8babd4631566483cfe4757..6622f0b222ec2c5ee8693eba6c6bf4138100eead 100644 (file)
--- a/contrib/build/stc/makefile.vc
+++ b/contrib/build/stc/makefile.vc
@@ -489,7 +489,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 <<
 !endif
 
-$(OBJS)\stcdll_version.res: ../../src/stc\src\msw\version.rc
+$(OBJS)\stcdll_version.res: ../../src/stc\..\..\..\src\msw\version.rc
        rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_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) /i ..\..\src\stc\..\..\..\include /i $(SETUPHDIR) /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG) $**
 
 $(OBJS)\stcdll_PlatWX.obj: ../../src/stc\PlatWX.cpp

diff --git a/contrib/build/stc/makefile.wat b/contrib/build/stc/makefile.wat
index 8aa5ee153790adcbe47c05964f9ce073dd846cc0..4cfaeb1378353e8f63442f06bdca57e0bf237689 100644 (file)
--- a/contrib/build/stc/makefile.wat
+++ b/contrib/build/stc/makefile.wat
@@ -423,7 +423,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
        wlib -q -p4096 -n -b $^@ @$(OBJS)\stclib.lbc
 !endif
 
-$(OBJS)\stcdll_version.res :  .AUTODEPEND ../../src/stc\src\msw\version.rc
+$(OBJS)\stcdll_version.res :  .AUTODEPEND ../../src/stc\..\..\..\src\msw\version.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=..\..\src\stc\..\..\..\include -i=$(SETUPHDIR) -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_wat$(VENDORTAG) $<
 
 $(OBJS)\stcdll_PlatWX.obj :  .AUTODEPEND ../../src/stc\PlatWX.cpp

diff --git a/contrib/build/stc/stc.dsp b/contrib/build/stc/stc.dsp
index 9e09e53bb3eba1c0385f20cf92995e1cbd4d1ef2..987734ea94184114dc6d05e867c77d122af349a6 100644 (file)
--- a/contrib/build/stc/stc.dsp
+++ b/contrib/build/stc/stc.dsp
@@ -736,7 +736,7 @@ SOURCE=../../src/stc\stc.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../src/stc\src\msw\version.rc
+SOURCE=../../src/stc\..\..\..\src\msw\version.rc
 
 !IF  "$(CFG)" == "stc - Win32 DLL Universal Unicode Release"
 

diff --git a/contrib/build/svg/makefile.bcc b/contrib/build/svg/makefile.bcc
index e80f2476dacd4869722d9a1f8bd7c7077ef8f75d..6516a6c20baa32280c241f2ba1ab17e86f32fab1 100644 (file)
--- a/contrib/build/svg/makefile.bcc
+++ b/contrib/build/svg/makefile.bcc
@@ -248,7 +248,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 $(OBJS)\svgdll_dummy.obj: ../../src/svg\..\..\..\src\msw\dummy.cpp
        $(CXX) -q -c -P -o$@ $(SVGDLL_CXXFLAGS) -H $**
 
-$(OBJS)\svgdll_version.res: ../../src/svg\src\msw\version.rc
+$(OBJS)\svgdll_version.res: ../../src/svg\..\..\..\src\msw\version.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) -i..\..\src\svg\..\..\..\include -i$(SETUPHDIR) -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg_bcc$(VENDORTAG) $**
 
 $(OBJS)\svgdll_dcsvg.obj: ../../src/svg\dcsvg.cpp

diff --git a/contrib/build/svg/makefile.gcc b/contrib/build/svg/makefile.gcc
index cd7c2107e2a75f4d851a96cd72c7fda53caf8585..3403bd821cf5f70528f12b734eb9e9c6df59c073 100644 (file)
--- a/contrib/build/svg/makefile.gcc
+++ b/contrib/build/svg/makefile.gcc
@@ -235,7 +235,7 @@ endif
 $(OBJS)\svgdll_dummy.o: ../../src/svg/../../../src/msw/dummy.cpp
        $(CXX) -c -o $@ $(SVGDLL_CXXFLAGS) $<
 
-$(OBJS)\svgdll_version_rc.o: ../../src/svg/src/msw/version.rc
+$(OBJS)\svgdll_version_rc.o: ../../src/svg/../../../src/msw/version.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) --include-dir ../../src/svg/../../../include --include-dir $(SETUPHDIR) --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg_gcc$(VENDORTAG)
 
 $(OBJS)\svgdll_dcsvg.o: ../../src/svg/dcsvg.cpp

diff --git a/contrib/build/svg/makefile.vc b/contrib/build/svg/makefile.vc
index 8e907f83c6d9ed3160aad1c6a2ce425aab9959cb..e00d2e08a31334eb01e3c522eeacac32f7ac80ba 100644 (file)
--- a/contrib/build/svg/makefile.vc
+++ b/contrib/build/svg/makefile.vc
@@ -352,7 +352,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 $(OBJS)\svgdll_dummy.obj: ../../src/svg\..\..\..\src\msw\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(SVGDLL_CXXFLAGS) /Ycwx/wxprec.h $**
 
-$(OBJS)\svgdll_version.res: ../../src/svg\src\msw\version.rc
+$(OBJS)\svgdll_version.res: ../../src/svg\..\..\..\src\msw\version.rc
        rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_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) /i ..\..\src\svg\..\..\..\include /i $(SETUPHDIR) /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg_vc$(VENDORTAG) $**
 
 $(OBJS)\svgdll_dcsvg.obj: ../../src/svg\dcsvg.cpp

diff --git a/contrib/build/svg/makefile.wat b/contrib/build/svg/makefile.wat
index 6fcbc6f6f2f6e2440bb9f7d46691aa3c2c106e61..cf7abaf9bd8fbbc0aaed41883106b637cb7b773b 100644 (file)
--- a/contrib/build/svg/makefile.wat
+++ b/contrib/build/svg/makefile.wat
@@ -286,7 +286,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 $(OBJS)\svgdll_dummy.obj :  .AUTODEPEND ../../src/svg\..\..\..\src\msw\dummy.cpp
        $(CXX) -zq -fo=$^@ $(SVGDLL_CXXFLAGS) $<
 
-$(OBJS)\svgdll_version.res :  .AUTODEPEND ../../src/svg\src\msw\version.rc
+$(OBJS)\svgdll_version.res :  .AUTODEPEND ../../src/svg\..\..\..\src\msw\version.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=..\..\src\svg\..\..\..\include -i=$(SETUPHDIR) -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg_wat$(VENDORTAG) $<
 
 $(OBJS)\svgdll_dcsvg.obj :  .AUTODEPEND ../../src/svg\dcsvg.cpp

diff --git a/contrib/build/svg/svg.dsp b/contrib/build/svg/svg.dsp
index 0dcbfaef3a86661a23a544727e762a3840096535..dfb884a3899b39971aede946ac14c0c0d4590dc8 100644 (file)
--- a/contrib/build/svg/svg.dsp
+++ b/contrib/build/svg/svg.dsp
@@ -462,7 +462,7 @@ SOURCE=../../src/svg\..\..\..\src\msw\dummy.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=../../src/svg\src\msw\version.rc
+SOURCE=../../src/svg\..\..\..\src\msw\version.rc
 
 !IF  "$(CFG)" == "svg - Win32 DLL Universal Unicode Release"
 

diff --git a/contrib/src/animate/Makefile.in b/contrib/src/animate/Makefile.in
index 3d6f0d12be8c7c59800ce43526650c7fbf3fc56c..a25bd82bdceb3002e8b521537a10d2749dc2ffe4 100644 (file)
--- a/contrib/src/animate/Makefile.in
+++ b/contrib/src/animate/Makefile.in
@@ -246,7 +246,7 @@ distclean: clean
 @COND_GCC_PCH_1@.pch/wxprec_animatelib/wx/wxprec.h.gch: 
 @COND_GCC_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_animatelib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(ANIMATELIB_CXXFLAGS)
 
-animatedll_version_rc.o: $(top_srcdir)/src/msw/version.rc $(ANIMATEDLL_ODEP)
+animatedll_version_rc.o: $(srcdir)/../../../src/msw/version.rc $(ANIMATEDLL_ODEP)
        $(RESCOMP) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) --include-dir $(top_srcdir)/include
 
 animatedll_animate.o: $(srcdir)/animate.cpp $(ANIMATEDLL_ODEP)

diff --git a/contrib/src/deprecated/Makefile.in b/contrib/src/deprecated/Makefile.in
index c56fa14ab9029697e6100f6eda91eedcdbfdb329..89d83b26bc7624d69e50293a4cef1df0a81c7678 100644 (file)
--- a/contrib/src/deprecated/Makefile.in
+++ b/contrib/src/deprecated/Makefile.in
@@ -276,7 +276,7 @@ distclean: clean
 @COND_GCC_PCH_1@.pch/wxprec_deprecatedlib/wx/wxprec.h.gch: 
 @COND_GCC_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_deprecatedlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(DEPRECATEDLIB_CXXFLAGS)
 
-deprecateddll_version_rc.o: $(top_srcdir)/src/msw/version.rc $(DEPRECATEDDLL_ODEP)
+deprecateddll_version_rc.o: $(srcdir)/../../../src/msw/version.rc $(DEPRECATEDDLL_ODEP)
        $(RESCOMP) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) --include-dir $(top_srcdir)/include
 
 deprecateddll_prop.o: $(srcdir)/prop.cpp $(DEPRECATEDDLL_ODEP)

diff --git a/contrib/src/fl/Makefile.in b/contrib/src/fl/Makefile.in
index e7c9cefed79602baf673e6482e7eff015a569a9c..13a12912a6a61ebfbb9a28385bc2dba2c12dd72d 100644 (file)
--- a/contrib/src/fl/Makefile.in
+++ b/contrib/src/fl/Makefile.in
@@ -277,7 +277,7 @@ distclean: clean
 @COND_GCC_PCH_1@.pch/wxprec_fllib/wx/wxprec.h.gch: 
 @COND_GCC_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_fllib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(FLLIB_CXXFLAGS)
 
-fldll_version_rc.o: $(top_srcdir)/src/msw/version.rc $(FLDLL_ODEP)
+fldll_version_rc.o: $(srcdir)/../../../src/msw/version.rc $(FLDLL_ODEP)
        $(RESCOMP) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) --include-dir $(top_srcdir)/include
 
 fldll_antiflickpl.o: $(srcdir)/antiflickpl.cpp $(FLDLL_ODEP)

diff --git a/contrib/src/foldbar/Makefile.in b/contrib/src/foldbar/Makefile.in
index 26af85aa3d8c31fda7575e6cb34ee621a6ee9ce1..0f2228899b30e9fc9c6d055e662ee44d3939fad9 100644 (file)
--- a/contrib/src/foldbar/Makefile.in
+++ b/contrib/src/foldbar/Makefile.in
@@ -250,7 +250,7 @@ distclean: clean
 @COND_GCC_PCH_1@.pch/wxprec_foldbarlib/wx/wxprec.h.gch: 
 @COND_GCC_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_foldbarlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(FOLDBARLIB_CXXFLAGS)
 
-foldbardll_version_rc.o: $(top_srcdir)/src/msw/version.rc $(FOLDBARDLL_ODEP)
+foldbardll_version_rc.o: $(srcdir)/../../../src/msw/version.rc $(FOLDBARDLL_ODEP)
        $(RESCOMP) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) --include-dir $(top_srcdir)/include
 
 foldbardll_captionbar.o: $(srcdir)/captionbar.cpp $(FOLDBARDLL_ODEP)

diff --git a/contrib/src/gizmos/Makefile.in b/contrib/src/gizmos/Makefile.in
index a6efed3d45c17aed87cd94790c59538b0f5b19b5..088c5df60e6577a5331a5105129d8c7d006049aa 100644 (file)
--- a/contrib/src/gizmos/Makefile.in
+++ b/contrib/src/gizmos/Makefile.in
@@ -255,7 +255,7 @@ distclean: clean
 @COND_GCC_PCH_1@.pch/wxprec_gizmoslib/wx/wxprec.h.gch: 
 @COND_GCC_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_gizmoslib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(GIZMOSLIB_CXXFLAGS)
 
-gizmosdll_version_rc.o: $(top_srcdir)/src/msw/version.rc $(GIZMOSDLL_ODEP)
+gizmosdll_version_rc.o: $(srcdir)/../../../src/msw/version.rc $(GIZMOSDLL_ODEP)
        $(RESCOMP) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) --include-dir $(top_srcdir)/include
 
 gizmosdll_dynamicsash.o: $(srcdir)/dynamicsash.cpp $(GIZMOSDLL_ODEP)

diff --git a/contrib/src/mmedia/Makefile.in b/contrib/src/mmedia/Makefile.in
index 686ec2e19a5c758018d7012781ff09f9a1b94408..1b208787f7c4417e0fec5e634686aac5ddd47c59 100644 (file)
--- a/contrib/src/mmedia/Makefile.in
+++ b/contrib/src/mmedia/Makefile.in
@@ -298,7 +298,7 @@ distclean: clean
 @COND_GCC_PCH_1@.pch/wxprec_mmedialib/wx/wxprec.h.gch: 
 @COND_GCC_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_mmedialib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(MMEDIALIB_CXXFLAGS)
 
-mmediadll_version_rc.o: $(top_srcdir)/src/msw/version.rc $(MMEDIADLL_ODEP)
+mmediadll_version_rc.o: $(srcdir)/../../../src/msw/version.rc $(MMEDIADLL_ODEP)
        $(RESCOMP) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) --include-dir $(top_srcdir)/include
 
 mmediadll_cdunix.o: $(srcdir)/cdunix.cpp $(MMEDIADLL_ODEP)

diff --git a/contrib/src/net/Makefile.in b/contrib/src/net/Makefile.in
index c046811430d970b1d3d9970df458f65e97ba5fcb..d2b73e6aba226681849ba7c22ae745fe1400a799 100644 (file)
--- a/contrib/src/net/Makefile.in
+++ b/contrib/src/net/Makefile.in
@@ -250,7 +250,7 @@ distclean: clean
 @COND_GCC_PCH_1@.pch/wxprec_netutilslib/wx/wxprec.h.gch: 
 @COND_GCC_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_netutilslib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(NETUTILSLIB_CXXFLAGS)
 
-netutilsdll_version_rc.o: $(top_srcdir)/src/msw/version.rc $(NETUTILSDLL_ODEP)
+netutilsdll_version_rc.o: $(srcdir)/../../../src/msw/version.rc $(NETUTILSDLL_ODEP)
        $(RESCOMP) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) --include-dir $(top_srcdir)/include
 
 netutilsdll_email.o: $(srcdir)/email.cpp $(NETUTILSDLL_ODEP)

diff --git a/contrib/src/ogl/Makefile.in b/contrib/src/ogl/Makefile.in
index 29e5e58bd554c7a481c7623e836bfd86ecba6fd8..8c1a12b1df390fd33dc7f227ffb90980de5211bf 100644 (file)
--- a/contrib/src/ogl/Makefile.in
+++ b/contrib/src/ogl/Makefile.in
@@ -267,7 +267,7 @@ distclean: clean
 @COND_GCC_PCH_1@.pch/wxprec_ogllib/wx/wxprec.h.gch: 
 @COND_GCC_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_ogllib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(OGLLIB_CXXFLAGS)
 
-ogldll_version_rc.o: $(top_srcdir)/src/msw/version.rc $(OGLDLL_ODEP)
+ogldll_version_rc.o: $(srcdir)/../../../src/msw/version.rc $(OGLDLL_ODEP)
        $(RESCOMP) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) --include-dir $(top_srcdir)/include
 
 ogldll_basic2.o: $(srcdir)/basic2.cpp $(OGLDLL_ODEP)

diff --git a/contrib/src/plot/Makefile.in b/contrib/src/plot/Makefile.in
index 4b00e4e4a83730b9339d5082088688498d2d4ee7..0283233cf5719e837f303412a180c26fd7c13656 100644 (file)
--- a/contrib/src/plot/Makefile.in
+++ b/contrib/src/plot/Makefile.in
@@ -245,7 +245,7 @@ distclean: clean
 @COND_GCC_PCH_1@.pch/wxprec_plotlib/wx/wxprec.h.gch: 
 @COND_GCC_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_plotlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(PLOTLIB_CXXFLAGS)
 
-plotdll_version_rc.o: $(top_srcdir)/src/msw/version.rc $(PLOTDLL_ODEP)
+plotdll_version_rc.o: $(srcdir)/../../../src/msw/version.rc $(PLOTDLL_ODEP)
        $(RESCOMP) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) --include-dir $(top_srcdir)/include
 
 plotdll_plot.o: $(srcdir)/plot.cpp $(PLOTDLL_ODEP)

diff --git a/contrib/src/stc/Makefile.in b/contrib/src/stc/Makefile.in
index 8610efbce5c9a85b87fd911ffa8e1aa3a52bad31..2125b4ccda9f9a3bdbc55c56a6bb7b1782ee1911 100644 (file)
--- a/contrib/src/stc/Makefile.in
+++ b/contrib/src/stc/Makefile.in
@@ -374,7 +374,7 @@ distclean: clean
 @COND_SHARED_0@        $(INSTALL_DIR) $(DESTDIR)$(libdir)
 @COND_SHARED_0@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
 
-stcdll_version_rc.o: $(top_srcdir)/src/msw/version.rc
+stcdll_version_rc.o: $(srcdir)/../../../src/msw/version.rc
        $(RESCOMP) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) --include-dir $(top_srcdir)/include
 
 stcdll_PlatWX.o: $(srcdir)/PlatWX.cpp

diff --git a/contrib/src/svg/Makefile.in b/contrib/src/svg/Makefile.in
index d5edf8af14e0e365dfd7e7fe2aa96d64b0a667f6..16d1bc432c9024905b919d191a6105d81777511c 100644 (file)
--- a/contrib/src/svg/Makefile.in
+++ b/contrib/src/svg/Makefile.in
@@ -245,7 +245,7 @@ distclean: clean
 @COND_GCC_PCH_1@.pch/wxprec_svglib/wx/wxprec.h.gch: 
 @COND_GCC_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_svglib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(SVGLIB_CXXFLAGS)
 
-svgdll_version_rc.o: $(top_srcdir)/src/msw/version.rc $(SVGDLL_ODEP)
+svgdll_version_rc.o: $(srcdir)/../../../src/msw/version.rc $(SVGDLL_ODEP)
        $(RESCOMP) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) --include-dir $(top_srcdir)/include
 
 svgdll_dcsvg.o: $(srcdir)/dcsvg.cpp $(SVGDLL_ODEP)

diff --git a/src/stc/Makefile.in b/src/stc/Makefile.in
index 8610efbce5c9a85b87fd911ffa8e1aa3a52bad31..2125b4ccda9f9a3bdbc55c56a6bb7b1782ee1911 100644 (file)
--- a/src/stc/Makefile.in
+++ b/src/stc/Makefile.in
@@ -374,7 +374,7 @@ distclean: clean
 @COND_SHARED_0@        $(INSTALL_DIR) $(DESTDIR)$(libdir)
 @COND_SHARED_0@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
 
-stcdll_version_rc.o: $(top_srcdir)/src/msw/version.rc
+stcdll_version_rc.o: $(srcdir)/../../../src/msw/version.rc
        $(RESCOMP) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) --include-dir $(top_srcdir)/include
 
 stcdll_PlatWX.o: $(srcdir)/PlatWX.cpp