Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Various dummy.cpp centralized in common/dummy.cpp. Build rebaked.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39482 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-05-31 11:48:45 +00:00
parent e267406e11
commit 66b9f7f7e4
94 changed files with 511 additions and 613 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/build/animate/animate.dsp
View File

@@ -456,7 +456,7 @@ SOURCE=../../src/animate\animate.cpp
# End Source File
# Begin Source File
SOURCE=../../src/animate\..\..\..\src\msw\dummy.cpp
SOURCE=../../src/animate\..\..\..\src\common\dummy.cpp
# ADD BASE CPP /Yc"wx/wxprec.h"
# ADD CPP /Yc"wx/wxprec.h"
# End Source File

6
contrib/build/animate/makefile.bcc
View File

@@ -238,7 +238,7 @@ clean:
!if "$(SHARED)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_animate_bcc$(VENDORTAG).dll: $(OBJS)\animatedll_dummy.obj $(ANIMATEDLL_OBJECTS) $(OBJS)\animatedll_version.res
ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
c0d32.obj $(ANIMATEDLL_OBJECTS),$@,, $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32$(__THREADSFLAG_6)$(__RUNTIME_LIBS_9).lib,, $(OBJS)\animatedll_version.res
c0d32.obj $(ANIMATEDLL_OBJECTS),$@,, $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32$(__THREADSFLAG_6)$(__RUNTIME_LIBS_9).lib,, $(OBJS)\animatedll_version.res
|
implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_animate $@
!endif
@@ -251,7 +251,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
|
!endif
$(OBJS)\animatedll_dummy.obj: ../../src/animate\..\..\..\src\msw\dummy.cpp
$(OBJS)\animatedll_dummy.obj: ../../src/animate\..\..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(ANIMATEDLL_CXXFLAGS) -H $**
$(OBJS)\animatedll_version.res: ../../src/animate\..\..\..\src\msw\version.rc
@@ -260,7 +260,7 @@ $(OBJS)\animatedll_version.res: ../../src/animate\..\..\..\src\msw\version.rc
$(OBJS)\animatedll_animate.obj: ../../src/animate\animate.cpp
$(CXX) -q -c -P -o$@ $(ANIMATEDLL_CXXFLAGS) $**
$(OBJS)\animatelib_dummy.obj: ../../src/animate\..\..\..\src\msw\dummy.cpp
$(OBJS)\animatelib_dummy.obj: ../../src/animate\..\..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(ANIMATELIB_CXXFLAGS) -H $**
$(OBJS)\animatelib_animate.obj: ../../src/animate\animate.cpp

6
contrib/build/animate/makefile.gcc
View File

@@ -232,7 +232,7 @@ clean:
ifeq ($(SHARED),1)
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_animate_gcc$(VENDORTAG).dll: $(ANIMATEDLL_OBJECTS) $(OBJS)\animatedll_version_rc.o
$(CXX) -shared -fPIC -o $@ $(ANIMATEDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_animate.a $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
$(CXX) -shared -fPIC -o $@ $(ANIMATEDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_animate.a $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
endif
ifeq ($(SHARED),0)
@@ -242,7 +242,7 @@ $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(
ranlib $@
endif
$(OBJS)\animatedll_dummy.o: ../../src/animate/../../../src/msw/dummy.cpp
$(OBJS)\animatedll_dummy.o: ../../src/animate/../../../src/common/dummy.cpp
$(CXX) -c -o $@ $(ANIMATEDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\animatedll_version_rc.o: ../../src/animate/../../../src/msw/version.rc
@@ -251,7 +251,7 @@ $(OBJS)\animatedll_version_rc.o: ../../src/animate/../../../src/msw/version.rc
$(OBJS)\animatedll_animate.o: ../../src/animate/animate.cpp
$(CXX) -c -o $@ $(ANIMATEDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\animatelib_dummy.o: ../../src/animate/../../../src/msw/dummy.cpp
$(OBJS)\animatelib_dummy.o: ../../src/animate/../../../src/common/dummy.cpp
$(CXX) -c -o $@ $(ANIMATELIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\animatelib_animate.o: ../../src/animate/animate.cpp

6
contrib/build/animate/makefile.vc
View File

@@ -323,7 +323,7 @@ clean:
!if "$(SHARED)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_animate_vc$(VENDORTAG).dll: $(OBJS)\animatedll_dummy.obj $(ANIMATEDLL_OBJECTS) $(OBJS)\animatedll_version.res
link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
$(ANIMATEDLL_OBJECTS) $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_animate.lib
$(ANIMATEDLL_OBJECTS) $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_animate.lib
<<
!endif
@@ -335,7 +335,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
<<
!endif
$(OBJS)\animatedll_dummy.obj: ../../src/animate\..\..\..\src\msw\dummy.cpp
$(OBJS)\animatedll_dummy.obj: ../../src/animate\..\..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ANIMATEDLL_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\animatedll_version.res: ../../src/animate\..\..\..\src\msw\version.rc
@@ -344,7 +344,7 @@ $(OBJS)\animatedll_version.res: ../../src/animate\..\..\..\src\msw\version.rc
$(OBJS)\animatedll_animate.obj: ../../src/animate\animate.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ANIMATEDLL_CXXFLAGS) $**
$(OBJS)\animatelib_dummy.obj: ../../src/animate\..\..\..\src\msw\dummy.cpp
$(OBJS)\animatelib_dummy.obj: ../../src/animate\..\..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ANIMATELIB_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\animatelib_animate.obj: ../../src/animate\animate.cpp

6
contrib/build/animate/makefile.wat
View File

@@ -270,7 +270,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
@%append $(OBJS)\animatedll.lbc option caseexact
@%append $(OBJS)\animatedll.lbc $(LDFLAGS) $(__DEBUGINFO_2) libpath $(LIBDIRNAME)
@for %i in ($(ANIMATEDLL_OBJECTS)) do @%append $(OBJS)\animatedll.lbc file %i
@for %i in ( $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\animatedll.lbc library %i
@for %i in ( $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\animatedll.lbc library %i
@%append $(OBJS)\animatedll.lbc option resource=$(OBJS)\animatedll_version.res
@%append $(OBJS)\animatedll.lbc system nt_dll
wlink @$(OBJS)\animatedll.lbc
@@ -284,7 +284,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
wlib -q -p4096 -n -b $^@ @$(OBJS)\animatelib.lbc
!endif
$(OBJS)\animatedll_dummy.obj : .AUTODEPEND ../../src/animate\..\..\..\src\msw\dummy.cpp
$(OBJS)\animatedll_dummy.obj : .AUTODEPEND ../../src/animate\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ANIMATEDLL_CXXFLAGS) $<
$(OBJS)\animatedll_version.res : .AUTODEPEND ../../src/animate\..\..\..\src\msw\version.rc
@@ -293,7 +293,7 @@ $(OBJS)\animatedll_version.res : .AUTODEPEND ../../src/animate\..\..\..\src\msw
$(OBJS)\animatedll_animate.obj : .AUTODEPEND ../../src/animate\animate.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ANIMATEDLL_CXXFLAGS) $<
$(OBJS)\animatelib_dummy.obj : .AUTODEPEND ../../src/animate\..\..\..\src\msw\dummy.cpp
$(OBJS)\animatelib_dummy.obj : .AUTODEPEND ../../src/animate\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ANIMATELIB_CXXFLAGS) $<
$(OBJS)\animatelib_animate.obj : .AUTODEPEND ../../src/animate\animate.cpp

2
contrib/build/deprecated/deprecated.dsp
View File

@@ -457,7 +457,7 @@ SOURCE=../../src/deprecated\dosyacc.c
# End Source File
# Begin Source File
SOURCE=../../src/deprecated\..\..\..\src\msw\dummy.cpp
SOURCE=../../src/deprecated\..\..\..\src\common\dummy.cpp
# ADD BASE CPP /Yc"wx/wxprec.h"
# ADD CPP /Yc"wx/wxprec.h"
# End Source File

6
contrib/build/deprecated/makefile.bcc
View File

@@ -267,7 +267,7 @@ clean:
!if "$(SHARED)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_bcc$(VENDORTAG).dll: $(OBJS)\deprecateddll_dummy.obj $(DEPRECATEDDLL_OBJECTS) $(OBJS)\deprecateddll_version.res
ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
c0d32.obj $(DEPRECATEDDLL_OBJECTS),$@,, $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32$(__THREADSFLAG_6)$(__RUNTIME_LIBS_9).lib,, $(OBJS)\deprecateddll_version.res
c0d32.obj $(DEPRECATEDDLL_OBJECTS),$@,, $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32$(__THREADSFLAG_6)$(__RUNTIME_LIBS_9).lib,, $(OBJS)\deprecateddll_version.res
|
implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated $@
!endif
@@ -280,7 +280,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
|
!endif
$(OBJS)\deprecateddll_dummy.obj: ../../src/deprecated\..\..\..\src\msw\dummy.cpp
$(OBJS)\deprecateddll_dummy.obj: ../../src/deprecated\..\..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(DEPRECATEDDLL_CXXFLAGS) -H $**
$(OBJS)\deprecateddll_version.res: ../../src/deprecated\..\..\..\src\msw\version.rc
@@ -310,7 +310,7 @@ $(OBJS)\deprecateddll_wxexpr.obj: ../../src/deprecated\wxexpr.cpp
$(OBJS)\deprecateddll_dosyacc.obj: ../../src/deprecated\dosyacc.c
$(CC) -q -c -P- -o$@ $(DEPRECATEDDLL_CFLAGS) $**
$(OBJS)\deprecatedlib_dummy.obj: ../../src/deprecated\..\..\..\src\msw\dummy.cpp
$(OBJS)\deprecatedlib_dummy.obj: ../../src/deprecated\..\..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(DEPRECATEDLIB_CXXFLAGS) -H $**
$(OBJS)\deprecatedlib_prop.obj: ../../src/deprecated\prop.cpp

6
contrib/build/deprecated/makefile.gcc
View File

@@ -260,7 +260,7 @@ clean:
ifeq ($(SHARED),1)
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_gcc$(VENDORTAG).dll: $(DEPRECATEDDLL_OBJECTS) $(OBJS)\deprecateddll_version_rc.o
$(CXX) -shared -fPIC -o $@ $(DEPRECATEDDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.a $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
$(CXX) -shared -fPIC -o $@ $(DEPRECATEDDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.a $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
endif
ifeq ($(SHARED),0)
@@ -270,7 +270,7 @@ $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(
ranlib $@
endif
$(OBJS)\deprecateddll_dummy.o: ../../src/deprecated/../../../src/msw/dummy.cpp
$(OBJS)\deprecateddll_dummy.o: ../../src/deprecated/../../../src/common/dummy.cpp
$(CXX) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\deprecateddll_version_rc.o: ../../src/deprecated/../../../src/msw/version.rc
@@ -300,7 +300,7 @@ $(OBJS)\deprecateddll_wxexpr.o: ../../src/deprecated/wxexpr.cpp
$(OBJS)\deprecateddll_dosyacc.o: ../../src/deprecated/dosyacc.c
$(CC) -c -o $@ $(DEPRECATEDDLL_CFLAGS) $(CPPDEPS) $<
$(OBJS)\deprecatedlib_dummy.o: ../../src/deprecated/../../../src/msw/dummy.cpp
$(OBJS)\deprecatedlib_dummy.o: ../../src/deprecated/../../../src/common/dummy.cpp
$(CXX) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\deprecatedlib_prop.o: ../../src/deprecated/prop.cpp

6
contrib/build/deprecated/makefile.vc
View File

@@ -357,7 +357,7 @@ clean:
!if "$(SHARED)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_vc$(VENDORTAG).dll: $(OBJS)\deprecateddll_dummy.obj $(DEPRECATEDDLL_OBJECTS) $(OBJS)\deprecateddll_version.res
link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
$(DEPRECATEDDLL_OBJECTS) $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib
$(DEPRECATEDDLL_OBJECTS) $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib
<<
!endif
@@ -369,7 +369,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
<<
!endif
$(OBJS)\deprecateddll_dummy.obj: ../../src/deprecated\..\..\..\src\msw\dummy.cpp
$(OBJS)\deprecateddll_dummy.obj: ../../src/deprecated\..\..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDDLL_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\deprecateddll_version.res: ../../src/deprecated\..\..\..\src\msw\version.rc
@@ -399,7 +399,7 @@ $(OBJS)\deprecateddll_wxexpr.obj: ../../src/deprecated\wxexpr.cpp
$(OBJS)\deprecateddll_dosyacc.obj: ../../src/deprecated\dosyacc.c
$(CC) /c /nologo /TC /Fo$@ $(DEPRECATEDDLL_CFLAGS) $**
$(OBJS)\deprecatedlib_dummy.obj: ../../src/deprecated\..\..\..\src\msw\dummy.cpp
$(OBJS)\deprecatedlib_dummy.obj: ../../src/deprecated\..\..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDLIB_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\deprecatedlib_prop.obj: ../../src/deprecated\prop.cpp

6
contrib/build/deprecated/makefile.wat
View File

@@ -300,7 +300,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
@%append $(OBJS)\deprecateddll.lbc option caseexact
@%append $(OBJS)\deprecateddll.lbc $(LDFLAGS) $(__DEBUGINFO_2) libpath $(LIBDIRNAME)
@for %i in ($(DEPRECATEDDLL_OBJECTS)) do @%append $(OBJS)\deprecateddll.lbc file %i
@for %i in ( $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\deprecateddll.lbc library %i
@for %i in ( $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\deprecateddll.lbc library %i
@%append $(OBJS)\deprecateddll.lbc option resource=$(OBJS)\deprecateddll_version.res
@%append $(OBJS)\deprecateddll.lbc system nt_dll
wlink @$(OBJS)\deprecateddll.lbc
@@ -314,7 +314,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
wlib -q -p4096 -n -b $^@ @$(OBJS)\deprecatedlib.lbc
!endif
$(OBJS)\deprecateddll_dummy.obj : .AUTODEPEND ../../src/deprecated\..\..\..\src\msw\dummy.cpp
$(OBJS)\deprecateddll_dummy.obj : .AUTODEPEND ../../src/deprecated\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $<
$(OBJS)\deprecateddll_version.res : .AUTODEPEND ../../src/deprecated\..\..\..\src\msw\version.rc
@@ -344,7 +344,7 @@ $(OBJS)\deprecateddll_wxexpr.obj : .AUTODEPEND ../../src/deprecated\wxexpr.cpp
$(OBJS)\deprecateddll_dosyacc.obj : .AUTODEPEND ../../src/deprecated\dosyacc.c
$(CC) -bt=nt -zq -fo=$^@ $(DEPRECATEDDLL_CFLAGS) $<
$(OBJS)\deprecatedlib_dummy.obj : .AUTODEPEND ../../src/deprecated\..\..\..\src\msw\dummy.cpp
$(OBJS)\deprecatedlib_dummy.obj : .AUTODEPEND ../../src/deprecated\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $<
$(OBJS)\deprecatedlib_prop.obj : .AUTODEPEND ../../src/deprecated\prop.cpp

2
contrib/build/fl/fl.dsp
View File

@@ -472,7 +472,7 @@ SOURCE=../../src/fl\controlbar.cpp
# End Source File
# Begin Source File
SOURCE=../../src/fl\..\..\..\src\msw\dummy.cpp
SOURCE=../../src/fl\..\..\..\src\common\dummy.cpp
# ADD BASE CPP /Yc"wx/wxprec.h"
# ADD CPP /Yc"wx/wxprec.h"
# End Source File

6
contrib/build/fl/makefile.bcc
View File

@@ -270,7 +270,7 @@ clean:
!if "$(SHARED)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_bcc$(VENDORTAG).dll: $(OBJS)\fldll_dummy.obj $(FLDLL_OBJECTS) $(OBJS)\fldll_version.res
ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
c0d32.obj $(FLDLL_OBJECTS),$@,, $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32$(__THREADSFLAG_6)$(__RUNTIME_LIBS_9).lib,, $(OBJS)\fldll_version.res
c0d32.obj $(FLDLL_OBJECTS),$@,, $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32$(__THREADSFLAG_6)$(__RUNTIME_LIBS_9).lib,, $(OBJS)\fldll_version.res
|
implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl $@
!endif
@@ -283,7 +283,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
|
!endif
$(OBJS)\fldll_dummy.obj: ../../src/fl\..\..\..\src\msw\dummy.cpp
$(OBJS)\fldll_dummy.obj: ../../src/fl\..\..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) -H $**
$(OBJS)\fldll_version.res: ../../src/fl\..\..\..\src\msw\version.rc
@@ -340,7 +340,7 @@ $(OBJS)\fldll_toolwnd.obj: ../../src/fl\toolwnd.cpp
$(OBJS)\fldll_updatesmgr.obj: ../../src/fl\updatesmgr.cpp
$(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) $**
$(OBJS)\fllib_dummy.obj: ../../src/fl\..\..\..\src\msw\dummy.cpp
$(OBJS)\fllib_dummy.obj: ../../src/fl\..\..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) -H $**
$(OBJS)\fllib_antiflickpl.obj: ../../src/fl\antiflickpl.cpp

6
contrib/build/fl/makefile.gcc
View File

@@ -263,7 +263,7 @@ clean:
ifeq ($(SHARED),1)
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_gcc$(VENDORTAG).dll: $(FLDLL_OBJECTS) $(OBJS)\fldll_version_rc.o
$(CXX) -shared -fPIC -o $@ $(FLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.a $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
$(CXX) -shared -fPIC -o $@ $(FLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.a $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
endif
ifeq ($(SHARED),0)
@@ -273,7 +273,7 @@ $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(
ranlib $@
endif
$(OBJS)\fldll_dummy.o: ../../src/fl/../../../src/msw/dummy.cpp
$(OBJS)\fldll_dummy.o: ../../src/fl/../../../src/common/dummy.cpp
$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\fldll_version_rc.o: ../../src/fl/../../../src/msw/version.rc
@@ -330,7 +330,7 @@ $(OBJS)\fldll_toolwnd.o: ../../src/fl/toolwnd.cpp
$(OBJS)\fldll_updatesmgr.o: ../../src/fl/updatesmgr.cpp
$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\fllib_dummy.o: ../../src/fl/../../../src/msw/dummy.cpp
$(OBJS)\fllib_dummy.o: ../../src/fl/../../../src/common/dummy.cpp
$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\fllib_antiflickpl.o: ../../src/fl/antiflickpl.cpp

6
contrib/build/fl/makefile.vc
View File

@@ -355,7 +355,7 @@ clean:
!if "$(SHARED)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_vc$(VENDORTAG).dll: $(OBJS)\fldll_dummy.obj $(FLDLL_OBJECTS) $(OBJS)\fldll_version.res
link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
$(FLDLL_OBJECTS) $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib
$(FLDLL_OBJECTS) $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib
<<
!endif
@@ -367,7 +367,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
<<
!endif
$(OBJS)\fldll_dummy.obj: ../../src/fl\..\..\..\src\msw\dummy.cpp
$(OBJS)\fldll_dummy.obj: ../../src/fl\..\..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\fldll_version.res: ../../src/fl\..\..\..\src\msw\version.rc
@@ -424,7 +424,7 @@ $(OBJS)\fldll_toolwnd.obj: ../../src/fl\toolwnd.cpp
$(OBJS)\fldll_updatesmgr.obj: ../../src/fl\updatesmgr.cpp
$(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) $**
$(OBJS)\fllib_dummy.obj: ../../src/fl\..\..\..\src\msw\dummy.cpp
$(OBJS)\fllib_dummy.obj: ../../src/fl\..\..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\fllib_antiflickpl.obj: ../../src/fl\antiflickpl.cpp

6
contrib/build/fl/makefile.wat
View File

@@ -301,7 +301,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
@%append $(OBJS)\fldll.lbc option caseexact
@%append $(OBJS)\fldll.lbc $(LDFLAGS) $(__DEBUGINFO_2) libpath $(LIBDIRNAME)
@for %i in ($(FLDLL_OBJECTS)) do @%append $(OBJS)\fldll.lbc file %i
@for %i in ( $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\fldll.lbc library %i
@for %i in ( $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\fldll.lbc library %i
@%append $(OBJS)\fldll.lbc option resource=$(OBJS)\fldll_version.res
@%append $(OBJS)\fldll.lbc system nt_dll
wlink @$(OBJS)\fldll.lbc
@@ -315,7 +315,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
wlib -q -p4096 -n -b $^@ @$(OBJS)\fllib.lbc
!endif
$(OBJS)\fldll_dummy.obj : .AUTODEPEND ../../src/fl\..\..\..\src\msw\dummy.cpp
$(OBJS)\fldll_dummy.obj : .AUTODEPEND ../../src/fl\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
$(OBJS)\fldll_version.res : .AUTODEPEND ../../src/fl\..\..\..\src\msw\version.rc
@@ -372,7 +372,7 @@ $(OBJS)\fldll_toolwnd.obj : .AUTODEPEND ../../src/fl\toolwnd.cpp
$(OBJS)\fldll_updatesmgr.obj : .AUTODEPEND ../../src/fl\updatesmgr.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
$(OBJS)\fllib_dummy.obj : .AUTODEPEND ../../src/fl\..\..\..\src\msw\dummy.cpp
$(OBJS)\fllib_dummy.obj : .AUTODEPEND ../../src/fl\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
$(OBJS)\fllib_antiflickpl.obj : .AUTODEPEND ../../src/fl\antiflickpl.cpp

2
contrib/build/foldbar/foldbar.dsp
View File

@@ -456,7 +456,7 @@ SOURCE=../../src/foldbar\captionbar.cpp
# End Source File
# Begin Source File
SOURCE=../../src/foldbar\..\..\..\src\msw\dummy.cpp
SOURCE=../../src/foldbar\..\..\..\src\common\dummy.cpp
# ADD BASE CPP /Yc"wx/wxprec.h"
# ADD CPP /Yc"wx/wxprec.h"
# End Source File

6
contrib/build/foldbar/makefile.bcc
View File

@@ -242,7 +242,7 @@ clean:
!if "$(SHARED)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_bcc$(VENDORTAG).dll: $(OBJS)\foldbardll_dummy.obj $(FOLDBARDLL_OBJECTS) $(OBJS)\foldbardll_version.res
ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
c0d32.obj $(FOLDBARDLL_OBJECTS),$@,, $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32$(__THREADSFLAG_6)$(__RUNTIME_LIBS_9).lib,, $(OBJS)\foldbardll_version.res
c0d32.obj $(FOLDBARDLL_OBJECTS),$@,, $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32$(__THREADSFLAG_6)$(__RUNTIME_LIBS_9).lib,, $(OBJS)\foldbardll_version.res
|
implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar $@
!endif
@@ -255,7 +255,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
|
!endif
$(OBJS)\foldbardll_dummy.obj: ../../src/foldbar\..\..\..\src\msw\dummy.cpp
$(OBJS)\foldbardll_dummy.obj: ../../src/foldbar\..\..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(FOLDBARDLL_CXXFLAGS) -H $**
$(OBJS)\foldbardll_version.res: ../../src/foldbar\..\..\..\src\msw\version.rc
@@ -270,7 +270,7 @@ $(OBJS)\foldbardll_foldpanelbar.obj: ../../src/foldbar\foldpanelbar.cpp
$(OBJS)\foldbardll_foldpanelitem.obj: ../../src/foldbar\foldpanelitem.cpp
$(CXX) -q -c -P -o$@ $(FOLDBARDLL_CXXFLAGS) $**
$(OBJS)\foldbarlib_dummy.obj: ../../src/foldbar\..\..\..\src\msw\dummy.cpp
$(OBJS)\foldbarlib_dummy.obj: ../../src/foldbar\..\..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(FOLDBARLIB_CXXFLAGS) -H $**
$(OBJS)\foldbarlib_captionbar.obj: ../../src/foldbar\captionbar.cpp

6
contrib/build/foldbar/makefile.gcc
View File

@@ -236,7 +236,7 @@ clean:
ifeq ($(SHARED),1)
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_gcc$(VENDORTAG).dll: $(FOLDBARDLL_OBJECTS) $(OBJS)\foldbardll_version_rc.o
$(CXX) -shared -fPIC -o $@ $(FOLDBARDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.a $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
$(CXX) -shared -fPIC -o $@ $(FOLDBARDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.a $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
endif
ifeq ($(SHARED),0)
@@ -246,7 +246,7 @@ $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(
ranlib $@
endif
$(OBJS)\foldbardll_dummy.o: ../../src/foldbar/../../../src/msw/dummy.cpp
$(OBJS)\foldbardll_dummy.o: ../../src/foldbar/../../../src/common/dummy.cpp
$(CXX) -c -o $@ $(FOLDBARDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\foldbardll_version_rc.o: ../../src/foldbar/../../../src/msw/version.rc
@@ -261,7 +261,7 @@ $(OBJS)\foldbardll_foldpanelbar.o: ../../src/foldbar/foldpanelbar.cpp
$(OBJS)\foldbardll_foldpanelitem.o: ../../src/foldbar/foldpanelitem.cpp
$(CXX) -c -o $@ $(FOLDBARDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\foldbarlib_dummy.o: ../../src/foldbar/../../../src/msw/dummy.cpp
$(OBJS)\foldbarlib_dummy.o: ../../src/foldbar/../../../src/common/dummy.cpp
$(CXX) -c -o $@ $(FOLDBARLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\foldbarlib_captionbar.o: ../../src/foldbar/captionbar.cpp

6
contrib/build/foldbar/makefile.vc
View File

@@ -327,7 +327,7 @@ clean:
!if "$(SHARED)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_vc$(VENDORTAG).dll: $(OBJS)\foldbardll_dummy.obj $(FOLDBARDLL_OBJECTS) $(OBJS)\foldbardll_version.res
link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
$(FOLDBARDLL_OBJECTS) $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.lib
$(FOLDBARDLL_OBJECTS) $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.lib
<<
!endif
@@ -339,7 +339,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
<<
!endif
$(OBJS)\foldbardll_dummy.obj: ../../src/foldbar\..\..\..\src\msw\dummy.cpp
$(OBJS)\foldbardll_dummy.obj: ../../src/foldbar\..\..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(FOLDBARDLL_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\foldbardll_version.res: ../../src/foldbar\..\..\..\src\msw\version.rc
@@ -354,7 +354,7 @@ $(OBJS)\foldbardll_foldpanelbar.obj: ../../src/foldbar\foldpanelbar.cpp
$(OBJS)\foldbardll_foldpanelitem.obj: ../../src/foldbar\foldpanelitem.cpp
$(CXX) /c /nologo /TP /Fo$@ $(FOLDBARDLL_CXXFLAGS) $**
$(OBJS)\foldbarlib_dummy.obj: ../../src/foldbar\..\..\..\src\msw\dummy.cpp
$(OBJS)\foldbarlib_dummy.obj: ../../src/foldbar\..\..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(FOLDBARLIB_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\foldbarlib_captionbar.obj: ../../src/foldbar\captionbar.cpp

6
contrib/build/foldbar/makefile.wat
View File

@@ -274,7 +274,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
@%append $(OBJS)\foldbardll.lbc option caseexact
@%append $(OBJS)\foldbardll.lbc $(LDFLAGS) $(__DEBUGINFO_2) libpath $(LIBDIRNAME)
@for %i in ($(FOLDBARDLL_OBJECTS)) do @%append $(OBJS)\foldbardll.lbc file %i
@for %i in ( $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\foldbardll.lbc library %i
@for %i in ( $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\foldbardll.lbc library %i
@%append $(OBJS)\foldbardll.lbc option resource=$(OBJS)\foldbardll_version.res
@%append $(OBJS)\foldbardll.lbc system nt_dll
wlink @$(OBJS)\foldbardll.lbc
@@ -288,7 +288,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
wlib -q -p4096 -n -b $^@ @$(OBJS)\foldbarlib.lbc
!endif
$(OBJS)\foldbardll_dummy.obj : .AUTODEPEND ../../src/foldbar\..\..\..\src\msw\dummy.cpp
$(OBJS)\foldbardll_dummy.obj : .AUTODEPEND ../../src/foldbar\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(FOLDBARDLL_CXXFLAGS) $<
$(OBJS)\foldbardll_version.res : .AUTODEPEND ../../src/foldbar\..\..\..\src\msw\version.rc
@@ -303,7 +303,7 @@ $(OBJS)\foldbardll_foldpanelbar.obj : .AUTODEPEND ../../src/foldbar\foldpanelba
$(OBJS)\foldbardll_foldpanelitem.obj : .AUTODEPEND ../../src/foldbar\foldpanelitem.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(FOLDBARDLL_CXXFLAGS) $<
$(OBJS)\foldbarlib_dummy.obj : .AUTODEPEND ../../src/foldbar\..\..\..\src\msw\dummy.cpp
$(OBJS)\foldbarlib_dummy.obj : .AUTODEPEND ../../src/foldbar\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(FOLDBARLIB_CXXFLAGS) $<
$(OBJS)\foldbarlib_captionbar.obj : .AUTODEPEND ../../src/foldbar\captionbar.cpp

2
contrib/build/gizmos/gizmos_gizmos.dsp
View File

@@ -452,7 +452,7 @@ LIB32=link.exe -lib
# PROP Default_Filter ""
# Begin Source File
SOURCE=../../src/gizmos\..\..\..\src\msw\dummy.cpp
SOURCE=../../src/gizmos\..\..\..\src\common\dummy.cpp
# ADD BASE CPP /Yc"wx/wxprec.h"
# ADD CPP /Yc"wx/wxprec.h"
# End Source File

2
contrib/build/gizmos/gizmos_gizmos_xrc.dsp
View File

@@ -452,7 +452,7 @@ LIB32=link.exe -lib
# PROP Default_Filter ""
# Begin Source File
SOURCE=../../src/gizmos\..\..\..\src\msw\dummy.cpp
SOURCE=../../src/gizmos\..\..\..\src\common\dummy.cpp
# ADD BASE CPP /Yc"wx/wxprec.h"
# ADD CPP /Yc"wx/wxprec.h"
# End Source File

12
contrib/build/gizmos/makefile.bcc
View File

@@ -292,7 +292,7 @@ clean:
!if "$(SHARED)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_bcc$(VENDORTAG).dll: $(OBJS)\gizmosdll_dummy.obj $(GIZMOSDLL_OBJECTS) $(OBJS)\gizmosdll_version.res
ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
c0d32.obj $(GIZMOSDLL_OBJECTS),$@,, $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_0).lib,, $(OBJS)\gizmosdll_version.res
c0d32.obj $(GIZMOSDLL_OBJECTS),$@,, $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_0).lib,, $(OBJS)\gizmosdll_version.res
|
implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos $@
!endif
@@ -300,7 +300,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
!if "$(SHARED)" == "1" && "$(USE_XRC)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_bcc$(VENDORTAG).dll: $(OBJS)\gizmos_xrcdll_dummy.obj $(GIZMOS_XRCDLL_OBJECTS) $(OBJS)\gizmos_xrcdll_version.res $(__gizmosdll___depname)
ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
c0d32.obj $(GIZMOS_XRCDLL_OBJECTS),$@,, $(__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 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib $(__WXLIB_XRC_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_0).lib,, $(OBJS)\gizmos_xrcdll_version.res
c0d32.obj $(GIZMOS_XRCDLL_OBJECTS),$@,, $(__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 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib $(__WXLIB_XRC_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_0).lib,, $(OBJS)\gizmos_xrcdll_version.res
|
implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc $@
!endif
@@ -321,7 +321,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
|
!endif
$(OBJS)\gizmosdll_dummy.obj: ../../src/gizmos\..\..\..\src\msw\dummy.cpp
$(OBJS)\gizmosdll_dummy.obj: ../../src/gizmos\..\..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(GIZMOSDLL_CXXFLAGS) -H $**
$(OBJS)\gizmosdll_version.res: ../../src/gizmos\..\..\..\src\msw\version.rc
@@ -345,7 +345,7 @@ $(OBJS)\gizmosdll_splittree.obj: ../../src/gizmos\splittree.cpp
$(OBJS)\gizmosdll_statpict.obj: ../../src/gizmos\statpict.cpp
$(CXX) -q -c -P -o$@ $(GIZMOSDLL_CXXFLAGS) $**
$(OBJS)\gizmos_xrcdll_dummy.obj: ../../src/gizmos\..\..\..\src\msw\dummy.cpp
$(OBJS)\gizmos_xrcdll_dummy.obj: ../../src/gizmos\..\..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(GIZMOS_XRCDLL_CXXFLAGS) -H $**
$(OBJS)\gizmos_xrcdll_version.res: ../../src/gizmos\..\..\..\src\msw\version.rc
@@ -354,7 +354,7 @@ $(OBJS)\gizmos_xrcdll_version.res: ../../src/gizmos\..\..\..\src\msw\version.rc
$(OBJS)\gizmos_xrcdll_xh_statpict.obj: ../../src/gizmos\xh_statpict.cpp
$(CXX) -q -c -P -o$@ $(GIZMOS_XRCDLL_CXXFLAGS) $**
$(OBJS)\gizmoslib_dummy.obj: ../../src/gizmos\..\..\..\src\msw\dummy.cpp
$(OBJS)\gizmoslib_dummy.obj: ../../src/gizmos\..\..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(GIZMOSLIB_CXXFLAGS) -H $**
$(OBJS)\gizmoslib_dynamicsash.obj: ../../src/gizmos\dynamicsash.cpp
@@ -375,7 +375,7 @@ $(OBJS)\gizmoslib_splittree.obj: ../../src/gizmos\splittree.cpp
$(OBJS)\gizmoslib_statpict.obj: ../../src/gizmos\statpict.cpp
$(CXX) -q -c -P -o$@ $(GIZMOSLIB_CXXFLAGS) $**
$(OBJS)\gizmos_xrclib_dummy.obj: ../../src/gizmos\..\..\..\src\msw\dummy.cpp
$(OBJS)\gizmos_xrclib_dummy.obj: ../../src/gizmos\..\..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(GIZMOS_XRCLIB_CXXFLAGS) -H $**
$(OBJS)\gizmos_xrclib_xh_statpict.obj: ../../src/gizmos\xh_statpict.cpp

12
contrib/build/gizmos/makefile.gcc
View File

@@ -287,13 +287,13 @@ clean:
ifeq ($(SHARED),1)
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_gcc$(VENDORTAG).dll: $(GIZMOSDLL_OBJECTS) $(OBJS)\gizmosdll_version_rc.o
$(CXX) -shared -fPIC -o $@ $(GIZMOSDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.a $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
$(CXX) -shared -fPIC -o $@ $(GIZMOSDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.a $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
endif
ifeq ($(SHARED),1)
ifeq ($(USE_XRC),1)
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_gcc$(VENDORTAG).dll: $(GIZMOS_XRCDLL_OBJECTS) $(OBJS)\gizmos_xrcdll_version_rc.o $(__gizmosdll___depname)
$(CXX) -shared -fPIC -o $@ $(GIZMOS_XRCDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.a $(__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 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.a $(__WXLIB_XRC_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
$(CXX) -shared -fPIC -o $@ $(GIZMOS_XRCDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.a $(__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 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.a $(__WXLIB_XRC_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
endif
endif
@@ -313,7 +313,7 @@ $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(
endif
endif
$(OBJS)\gizmosdll_dummy.o: ../../src/gizmos/../../../src/msw/dummy.cpp
$(OBJS)\gizmosdll_dummy.o: ../../src/gizmos/../../../src/common/dummy.cpp
$(CXX) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\gizmosdll_version_rc.o: ../../src/gizmos/../../../src/msw/version.rc
@@ -337,7 +337,7 @@ $(OBJS)\gizmosdll_splittree.o: ../../src/gizmos/splittree.cpp
$(OBJS)\gizmosdll_statpict.o: ../../src/gizmos/statpict.cpp
$(CXX) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\gizmos_xrcdll_dummy.o: ../../src/gizmos/../../../src/msw/dummy.cpp
$(OBJS)\gizmos_xrcdll_dummy.o: ../../src/gizmos/../../../src/common/dummy.cpp
$(CXX) -c -o $@ $(GIZMOS_XRCDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\gizmos_xrcdll_version_rc.o: ../../src/gizmos/../../../src/msw/version.rc
@@ -346,7 +346,7 @@ $(OBJS)\gizmos_xrcdll_version_rc.o: ../../src/gizmos/../../../src/msw/version.rc
$(OBJS)\gizmos_xrcdll_xh_statpict.o: ../../src/gizmos/xh_statpict.cpp
$(CXX) -c -o $@ $(GIZMOS_XRCDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\gizmoslib_dummy.o: ../../src/gizmos/../../../src/msw/dummy.cpp
$(OBJS)\gizmoslib_dummy.o: ../../src/gizmos/../../../src/common/dummy.cpp
$(CXX) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\gizmoslib_dynamicsash.o: ../../src/gizmos/dynamicsash.cpp
@@ -367,7 +367,7 @@ $(OBJS)\gizmoslib_splittree.o: ../../src/gizmos/splittree.cpp
$(OBJS)\gizmoslib_statpict.o: ../../src/gizmos/statpict.cpp
$(CXX) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\gizmos_xrclib_dummy.o: ../../src/gizmos/../../../src/msw/dummy.cpp
$(OBJS)\gizmos_xrclib_dummy.o: ../../src/gizmos/../../../src/common/dummy.cpp
$(CXX) -c -o $@ $(GIZMOS_XRCLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\gizmos_xrclib_xh_statpict.o: ../../src/gizmos/xh_statpict.cpp

12
contrib/build/gizmos/makefile.vc
View File

@@ -393,14 +393,14 @@ clean:
!if "$(SHARED)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_vc$(VENDORTAG).dll: $(OBJS)\gizmosdll_dummy.obj $(GIZMOSDLL_OBJECTS) $(OBJS)\gizmosdll_version.res
link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
$(GIZMOSDLL_OBJECTS) $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib
$(GIZMOSDLL_OBJECTS) $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib
<<
!endif
!if "$(SHARED)" == "1" && "$(USE_XRC)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_vc$(VENDORTAG).dll: $(OBJS)\gizmos_xrcdll_dummy.obj $(GIZMOS_XRCDLL_OBJECTS) $(OBJS)\gizmos_xrcdll_version.res $(__gizmosdll___depname)
link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
$(GIZMOS_XRCDLL_OBJECTS) $(__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 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib $(__WXLIB_XRC_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.lib
$(GIZMOS_XRCDLL_OBJECTS) $(__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 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib $(__WXLIB_XRC_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.lib
<<
!endif
@@ -420,7 +420,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
<<
!endif
$(OBJS)\gizmosdll_dummy.obj: ../../src/gizmos\..\..\..\src\msw\dummy.cpp
$(OBJS)\gizmosdll_dummy.obj: ../../src/gizmos\..\..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(GIZMOSDLL_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\gizmosdll_version.res: ../../src/gizmos\..\..\..\src\msw\version.rc
@@ -444,7 +444,7 @@ $(OBJS)\gizmosdll_splittree.obj: ../../src/gizmos\splittree.cpp
$(OBJS)\gizmosdll_statpict.obj: ../../src/gizmos\statpict.cpp
$(CXX) /c /nologo /TP /Fo$@ $(GIZMOSDLL_CXXFLAGS) $**
$(OBJS)\gizmos_xrcdll_dummy.obj: ../../src/gizmos\..\..\..\src\msw\dummy.cpp
$(OBJS)\gizmos_xrcdll_dummy.obj: ../../src/gizmos\..\..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(GIZMOS_XRCDLL_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\gizmos_xrcdll_version.res: ../../src/gizmos\..\..\..\src\msw\version.rc
@@ -453,7 +453,7 @@ $(OBJS)\gizmos_xrcdll_version.res: ../../src/gizmos\..\..\..\src\msw\version.rc
$(OBJS)\gizmos_xrcdll_xh_statpict.obj: ../../src/gizmos\xh_statpict.cpp
$(CXX) /c /nologo /TP /Fo$@ $(GIZMOS_XRCDLL_CXXFLAGS) $**
$(OBJS)\gizmoslib_dummy.obj: ../../src/gizmos\..\..\..\src\msw\dummy.cpp
$(OBJS)\gizmoslib_dummy.obj: ../../src/gizmos\..\..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(GIZMOSLIB_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\gizmoslib_dynamicsash.obj: ../../src/gizmos\dynamicsash.cpp
@@ -474,7 +474,7 @@ $(OBJS)\gizmoslib_splittree.obj: ../../src/gizmos\splittree.cpp
$(OBJS)\gizmoslib_statpict.obj: ../../src/gizmos\statpict.cpp
$(CXX) /c /nologo /TP /Fo$@ $(GIZMOSLIB_CXXFLAGS) $**
$(OBJS)\gizmos_xrclib_dummy.obj: ../../src/gizmos\..\..\..\src\msw\dummy.cpp
$(OBJS)\gizmos_xrclib_dummy.obj: ../../src/gizmos\..\..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(GIZMOS_XRCLIB_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\gizmos_xrclib_xh_statpict.obj: ../../src/gizmos\xh_statpict.cpp

12
contrib/build/gizmos/makefile.wat
View File

@@ -327,7 +327,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
@%append $(OBJS)\gizmosdll.lbc option caseexact
@%append $(OBJS)\gizmosdll.lbc $(LDFLAGS) $(__DEBUGINFO) libpath $(LIBDIRNAME)
@for %i in ($(GIZMOSDLL_OBJECTS)) do @%append $(OBJS)\gizmosdll.lbc file %i
@for %i in ( $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\gizmosdll.lbc library %i
@for %i in ( $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\gizmosdll.lbc library %i
@%append $(OBJS)\gizmosdll.lbc option resource=$(OBJS)\gizmosdll_version.res
@%append $(OBJS)\gizmosdll.lbc system nt_dll
wlink @$(OBJS)\gizmosdll.lbc
@@ -343,7 +343,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
@%append $(OBJS)\gizmos_xrcdll.lbc option caseexact
@%append $(OBJS)\gizmos_xrcdll.lbc $(LDFLAGS) $(__DEBUGINFO) libpath $(LIBDIRNAME)
@for %i in ($(GIZMOS_XRCDLL_OBJECTS)) do @%append $(OBJS)\gizmos_xrcdll.lbc file %i
@for %i in ( $(__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 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib $(__WXLIB_XRC_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\gizmos_xrcdll.lbc library %i
@for %i in ( $(__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 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib $(__WXLIB_XRC_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\gizmos_xrcdll.lbc library %i
@%append $(OBJS)\gizmos_xrcdll.lbc option resource=$(OBJS)\gizmos_xrcdll_version.res
@%append $(OBJS)\gizmos_xrcdll.lbc system nt_dll
wlink @$(OBJS)\gizmos_xrcdll.lbc
@@ -367,7 +367,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
!endif
!endif
$(OBJS)\gizmosdll_dummy.obj : .AUTODEPEND ../../src/gizmos\..\..\..\src\msw\dummy.cpp
$(OBJS)\gizmosdll_dummy.obj : .AUTODEPEND ../../src/gizmos\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(GIZMOSDLL_CXXFLAGS) $<
$(OBJS)\gizmosdll_version.res : .AUTODEPEND ../../src/gizmos\..\..\..\src\msw\version.rc
@@ -391,7 +391,7 @@ $(OBJS)\gizmosdll_splittree.obj : .AUTODEPEND ../../src/gizmos\splittree.cpp
$(OBJS)\gizmosdll_statpict.obj : .AUTODEPEND ../../src/gizmos\statpict.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(GIZMOSDLL_CXXFLAGS) $<
$(OBJS)\gizmos_xrcdll_dummy.obj : .AUTODEPEND ../../src/gizmos\..\..\..\src\msw\dummy.cpp
$(OBJS)\gizmos_xrcdll_dummy.obj : .AUTODEPEND ../../src/gizmos\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(GIZMOS_XRCDLL_CXXFLAGS) $<
$(OBJS)\gizmos_xrcdll_version.res : .AUTODEPEND ../../src/gizmos\..\..\..\src\msw\version.rc
@@ -400,7 +400,7 @@ $(OBJS)\gizmos_xrcdll_version.res : .AUTODEPEND ../../src/gizmos\..\..\..\src\m
$(OBJS)\gizmos_xrcdll_xh_statpict.obj : .AUTODEPEND ../../src/gizmos\xh_statpict.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(GIZMOS_XRCDLL_CXXFLAGS) $<
$(OBJS)\gizmoslib_dummy.obj : .AUTODEPEND ../../src/gizmos\..\..\..\src\msw\dummy.cpp
$(OBJS)\gizmoslib_dummy.obj : .AUTODEPEND ../../src/gizmos\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(GIZMOSLIB_CXXFLAGS) $<
$(OBJS)\gizmoslib_dynamicsash.obj : .AUTODEPEND ../../src/gizmos\dynamicsash.cpp
@@ -421,7 +421,7 @@ $(OBJS)\gizmoslib_splittree.obj : .AUTODEPEND ../../src/gizmos\splittree.cpp
$(OBJS)\gizmoslib_statpict.obj : .AUTODEPEND ../../src/gizmos\statpict.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(GIZMOSLIB_CXXFLAGS) $<
$(OBJS)\gizmos_xrclib_dummy.obj : .AUTODEPEND ../../src/gizmos\..\..\..\src\msw\dummy.cpp
$(OBJS)\gizmos_xrclib_dummy.obj : .AUTODEPEND ../../src/gizmos\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(GIZMOS_XRCLIB_CXXFLAGS) $<
$(OBJS)\gizmos_xrclib_xh_statpict.obj : .AUTODEPEND ../../src/gizmos\xh_statpict.cpp

6
contrib/build/mmedia/makefile.bcc
View File

@@ -276,7 +276,7 @@ clean:
!if "$(SHARED)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia_bcc$(VENDORTAG).dll: $(OBJS)\mmediadll_dummy.obj $(MMEDIADLL_OBJECTS) $(OBJS)\mmediadll_version.res
ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
c0d32.obj $(MMEDIADLL_OBJECTS),$@,, $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32$(__THREADSFLAG_6)$(__RUNTIME_LIBS_9).lib,, $(OBJS)\mmediadll_version.res
c0d32.obj $(MMEDIADLL_OBJECTS),$@,, $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32$(__THREADSFLAG_6)$(__RUNTIME_LIBS_9).lib,, $(OBJS)\mmediadll_version.res
|
implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia $@
!endif
@@ -289,7 +289,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
|
!endif
$(OBJS)\mmediadll_dummy.obj: ../../src/mmedia\..\..\..\src\msw\dummy.cpp
$(OBJS)\mmediadll_dummy.obj: ../../src/mmedia\..\..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) -H $**
$(OBJS)\mmediadll_version.res: ../../src/mmedia\..\..\..\src\msw\version.rc
@@ -355,7 +355,7 @@ $(OBJS)\mmediadll_sndwav.obj: ../../src/mmedia\sndwav.cpp
$(OBJS)\mmediadll_vidbase.obj: ../../src/mmedia\vidbase.cpp
$(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) $**
$(OBJS)\mmedialib_dummy.obj: ../../src/mmedia\..\..\..\src\msw\dummy.cpp
$(OBJS)\mmedialib_dummy.obj: ../../src/mmedia\..\..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) -H $**
$(OBJS)\mmedialib_cdwin.obj: ../../src/mmedia\cdwin.cpp

6
contrib/build/mmedia/makefile.gcc
View File

@@ -270,7 +270,7 @@ clean:
ifeq ($(SHARED),1)
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia_gcc$(VENDORTAG).dll: $(MMEDIADLL_OBJECTS) $(OBJS)\mmediadll_version_rc.o
$(CXX) -shared -fPIC -o $@ $(MMEDIADLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.a $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
$(CXX) -shared -fPIC -o $@ $(MMEDIADLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.a $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
endif
ifeq ($(SHARED),0)
@@ -280,7 +280,7 @@ $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(
ranlib $@
endif
$(OBJS)\mmediadll_dummy.o: ../../src/mmedia/../../../src/msw/dummy.cpp
$(OBJS)\mmediadll_dummy.o: ../../src/mmedia/../../../src/common/dummy.cpp
$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\mmediadll_version_rc.o: ../../src/mmedia/../../../src/msw/version.rc
@@ -346,7 +346,7 @@ $(OBJS)\mmediadll_sndwav.o: ../../src/mmedia/sndwav.cpp
$(OBJS)\mmediadll_vidbase.o: ../../src/mmedia/vidbase.cpp
$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\mmedialib_dummy.o: ../../src/mmedia/../../../src/msw/dummy.cpp
$(OBJS)\mmedialib_dummy.o: ../../src/mmedia/../../../src/common/dummy.cpp
$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\mmedialib_cdwin.o: ../../src/mmedia/cdwin.cpp

6
contrib/build/mmedia/makefile.vc
View File

@@ -361,7 +361,7 @@ clean:
!if "$(SHARED)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia_vc$(VENDORTAG).dll: $(OBJS)\mmediadll_dummy.obj $(MMEDIADLL_OBJECTS) $(OBJS)\mmediadll_version.res
link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
$(MMEDIADLL_OBJECTS) $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.lib
$(MMEDIADLL_OBJECTS) $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.lib
<<
!endif
@@ -373,7 +373,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
<<
!endif
$(OBJS)\mmediadll_dummy.obj: ../../src/mmedia\..\..\..\src\msw\dummy.cpp
$(OBJS)\mmediadll_dummy.obj: ../../src/mmedia\..\..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\mmediadll_version.res: ../../src/mmedia\..\..\..\src\msw\version.rc
@@ -439,7 +439,7 @@ $(OBJS)\mmediadll_sndwav.obj: ../../src/mmedia\sndwav.cpp
$(OBJS)\mmediadll_vidbase.obj: ../../src/mmedia\vidbase.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) $**
$(OBJS)\mmedialib_dummy.obj: ../../src/mmedia\..\..\..\src\msw\dummy.cpp
$(OBJS)\mmedialib_dummy.obj: ../../src/mmedia\..\..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\mmedialib_cdwin.obj: ../../src/mmedia\cdwin.cpp

6
contrib/build/mmedia/makefile.wat
View File

@@ -307,7 +307,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
@%append $(OBJS)\mmediadll.lbc option caseexact
@%append $(OBJS)\mmediadll.lbc $(LDFLAGS) $(__DEBUGINFO_2) libpath $(LIBDIRNAME)
@for %i in ($(MMEDIADLL_OBJECTS)) do @%append $(OBJS)\mmediadll.lbc file %i
@for %i in ( $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\mmediadll.lbc library %i
@for %i in ( $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\mmediadll.lbc library %i
@%append $(OBJS)\mmediadll.lbc option resource=$(OBJS)\mmediadll_version.res
@%append $(OBJS)\mmediadll.lbc system nt_dll
wlink @$(OBJS)\mmediadll.lbc
@@ -321,7 +321,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
wlib -q -p4096 -n -b $^@ @$(OBJS)\mmedialib.lbc
!endif
$(OBJS)\mmediadll_dummy.obj : .AUTODEPEND ../../src/mmedia\..\..\..\src\msw\dummy.cpp
$(OBJS)\mmediadll_dummy.obj : .AUTODEPEND ../../src/mmedia\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmediadll_version.res : .AUTODEPEND ../../src/mmedia\..\..\..\src\msw\version.rc
@@ -387,7 +387,7 @@ $(OBJS)\mmediadll_sndwav.obj : .AUTODEPEND ../../src/mmedia\sndwav.cpp
$(OBJS)\mmediadll_vidbase.obj : .AUTODEPEND ../../src/mmedia\vidbase.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmedialib_dummy.obj : .AUTODEPEND ../../src/mmedia\..\..\..\src\msw\dummy.cpp
$(OBJS)\mmedialib_dummy.obj : .AUTODEPEND ../../src/mmedia\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
$(OBJS)\mmedialib_cdwin.obj : .AUTODEPEND ../../src/mmedia\cdwin.cpp

2
contrib/build/mmedia/mmedia.dsp
View File

@@ -460,7 +460,7 @@ SOURCE=../../src/mmedia\cdwin.cpp
# End Source File
# Begin Source File
SOURCE=../../src/mmedia\..\..\..\src\msw\dummy.cpp
SOURCE=../../src/mmedia\..\..\..\src\common\dummy.cpp
# ADD BASE CPP /Yc"wx/wxprec.h"
# ADD CPP /Yc"wx/wxprec.h"
# End Source File

6
contrib/build/net/makefile.bcc
View File

@@ -242,7 +242,7 @@ clean:
!if "$(SHARED)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_bcc$(VENDORTAG).dll: $(OBJS)\netutilsdll_dummy.obj $(NETUTILSDLL_OBJECTS) $(OBJS)\netutilsdll_version.res
ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
c0d32.obj $(NETUTILSDLL_OBJECTS),$@,, $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32$(__THREADSFLAG_6)$(__RUNTIME_LIBS_9).lib,, $(OBJS)\netutilsdll_version.res
c0d32.obj $(NETUTILSDLL_OBJECTS),$@,, $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32$(__THREADSFLAG_6)$(__RUNTIME_LIBS_9).lib,, $(OBJS)\netutilsdll_version.res
|
implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils $@
!endif
@@ -255,7 +255,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
|
!endif
$(OBJS)\netutilsdll_dummy.obj: ../../src/net\..\..\..\src\msw\dummy.cpp
$(OBJS)\netutilsdll_dummy.obj: ../../src/net\..\..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(NETUTILSDLL_CXXFLAGS) -H $**
$(OBJS)\netutilsdll_version.res: ../../src/net\..\..\..\src\msw\version.rc
@@ -270,7 +270,7 @@ $(OBJS)\netutilsdll_smapi.obj: ../../src/net\smapi.cpp
$(OBJS)\netutilsdll_web.obj: ../../src/net\web.cpp
$(CXX) -q -c -P -o$@ $(NETUTILSDLL_CXXFLAGS) $**
$(OBJS)\netutilslib_dummy.obj: ../../src/net\..\..\..\src\msw\dummy.cpp
$(OBJS)\netutilslib_dummy.obj: ../../src/net\..\..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(NETUTILSLIB_CXXFLAGS) -H $**
$(OBJS)\netutilslib_email.obj: ../../src/net\email.cpp

6
contrib/build/net/makefile.gcc
View File

@@ -236,7 +236,7 @@ clean:
ifeq ($(SHARED),1)
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_gcc$(VENDORTAG).dll: $(NETUTILSDLL_OBJECTS) $(OBJS)\netutilsdll_version_rc.o
$(CXX) -shared -fPIC -o $@ $(NETUTILSDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.a $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
$(CXX) -shared -fPIC -o $@ $(NETUTILSDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.a $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
endif
ifeq ($(SHARED),0)
@@ -246,7 +246,7 @@ $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(
ranlib $@
endif
$(OBJS)\netutilsdll_dummy.o: ../../src/net/../../../src/msw/dummy.cpp
$(OBJS)\netutilsdll_dummy.o: ../../src/net/../../../src/common/dummy.cpp
$(CXX) -c -o $@ $(NETUTILSDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\netutilsdll_version_rc.o: ../../src/net/../../../src/msw/version.rc
@@ -261,7 +261,7 @@ $(OBJS)\netutilsdll_smapi.o: ../../src/net/smapi.cpp
$(OBJS)\netutilsdll_web.o: ../../src/net/web.cpp
$(CXX) -c -o $@ $(NETUTILSDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\netutilslib_dummy.o: ../../src/net/../../../src/msw/dummy.cpp
$(OBJS)\netutilslib_dummy.o: ../../src/net/../../../src/common/dummy.cpp
$(CXX) -c -o $@ $(NETUTILSLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\netutilslib_email.o: ../../src/net/email.cpp

6
contrib/build/net/makefile.vc
View File

@@ -328,7 +328,7 @@ clean:
!if "$(SHARED)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_vc$(VENDORTAG).dll: $(OBJS)\netutilsdll_dummy.obj $(NETUTILSDLL_OBJECTS) $(OBJS)\netutilsdll_version.res
link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
$(NETUTILSDLL_OBJECTS) $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.lib
$(NETUTILSDLL_OBJECTS) $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.lib
<<
!endif
@@ -340,7 +340,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
<<
!endif
$(OBJS)\netutilsdll_dummy.obj: ../../src/net\..\..\..\src\msw\dummy.cpp
$(OBJS)\netutilsdll_dummy.obj: ../../src/net\..\..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(NETUTILSDLL_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\netutilsdll_version.res: ../../src/net\..\..\..\src\msw\version.rc
@@ -355,7 +355,7 @@ $(OBJS)\netutilsdll_smapi.obj: ../../src/net\smapi.cpp
$(OBJS)\netutilsdll_web.obj: ../../src/net\web.cpp
$(CXX) /c /nologo /TP /Fo$@ $(NETUTILSDLL_CXXFLAGS) $**
$(OBJS)\netutilslib_dummy.obj: ../../src/net\..\..\..\src\msw\dummy.cpp
$(OBJS)\netutilslib_dummy.obj: ../../src/net\..\..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(NETUTILSLIB_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\netutilslib_email.obj: ../../src/net\email.cpp

6
contrib/build/net/makefile.wat
View File

@@ -273,7 +273,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
@%append $(OBJS)\netutilsdll.lbc option caseexact
@%append $(OBJS)\netutilsdll.lbc $(LDFLAGS) $(__DEBUGINFO_2) libpath $(LIBDIRNAME)
@for %i in ($(NETUTILSDLL_OBJECTS)) do @%append $(OBJS)\netutilsdll.lbc file %i
@for %i in ( $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\netutilsdll.lbc library %i
@for %i in ( $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\netutilsdll.lbc library %i
@%append $(OBJS)\netutilsdll.lbc option resource=$(OBJS)\netutilsdll_version.res
@%append $(OBJS)\netutilsdll.lbc system nt_dll
wlink @$(OBJS)\netutilsdll.lbc
@@ -287,7 +287,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
wlib -q -p4096 -n -b $^@ @$(OBJS)\netutilslib.lbc
!endif
$(OBJS)\netutilsdll_dummy.obj : .AUTODEPEND ../../src/net\..\..\..\src\msw\dummy.cpp
$(OBJS)\netutilsdll_dummy.obj : .AUTODEPEND ../../src/net\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(NETUTILSDLL_CXXFLAGS) $<
$(OBJS)\netutilsdll_version.res : .AUTODEPEND ../../src/net\..\..\..\src\msw\version.rc
@@ -302,7 +302,7 @@ $(OBJS)\netutilsdll_smapi.obj : .AUTODEPEND ../../src/net\smapi.cpp
$(OBJS)\netutilsdll_web.obj : .AUTODEPEND ../../src/net\web.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(NETUTILSDLL_CXXFLAGS) $<
$(OBJS)\netutilslib_dummy.obj : .AUTODEPEND ../../src/net\..\..\..\src\msw\dummy.cpp
$(OBJS)\netutilslib_dummy.obj : .AUTODEPEND ../../src/net\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(NETUTILSLIB_CXXFLAGS) $<
$(OBJS)\netutilslib_email.obj : .AUTODEPEND ../../src/net\email.cpp

2
contrib/build/net/net.dsp
View File

@@ -452,7 +452,7 @@ LIB32=link.exe -lib
# PROP Default_Filter ""
# Begin Source File
SOURCE=../../src/net\..\..\..\src\msw\dummy.cpp
SOURCE=../../src/net\..\..\..\src\common\dummy.cpp
# ADD BASE CPP /Yc"wx/wxprec.h"
# ADD CPP /Yc"wx/wxprec.h"
# End Source File

6
contrib/build/ogl/makefile.bcc
View File

@@ -260,7 +260,7 @@ clean:
!if "$(SHARED)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_bcc$(VENDORTAG).dll: $(OBJS)\ogldll_dummy.obj $(OGLDLL_OBJECTS) $(OBJS)\ogldll_version.res
ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
c0d32.obj $(OGLDLL_OBJECTS),$@,, $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32$(__THREADSFLAG_6)$(__RUNTIME_LIBS_9).lib,, $(OBJS)\ogldll_version.res
c0d32.obj $(OGLDLL_OBJECTS),$@,, $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32$(__THREADSFLAG_6)$(__RUNTIME_LIBS_9).lib,, $(OBJS)\ogldll_version.res
|
implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl $@
!endif
@@ -273,7 +273,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
|
!endif
$(OBJS)\ogldll_dummy.obj: ../../src/ogl\..\..\..\src\msw\dummy.cpp
$(OBJS)\ogldll_dummy.obj: ../../src/ogl\..\..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(OGLDLL_CXXFLAGS) -H $**
$(OBJS)\ogldll_version.res: ../../src/ogl\..\..\..\src\msw\version.rc
@@ -315,7 +315,7 @@ $(OBJS)\ogldll_lines.obj: ../../src/ogl\lines.cpp
$(OBJS)\ogldll_ogldiag.obj: ../../src/ogl\ogldiag.cpp
$(CXX) -q -c -P -o$@ $(OGLDLL_CXXFLAGS) $**
$(OBJS)\ogllib_dummy.obj: ../../src/ogl\..\..\..\src\msw\dummy.cpp
$(OBJS)\ogllib_dummy.obj: ../../src/ogl\..\..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(OGLLIB_CXXFLAGS) -H $**
$(OBJS)\ogllib_basic2.obj: ../../src/ogl\basic2.cpp

6
contrib/build/ogl/makefile.gcc
View File

@@ -253,7 +253,7 @@ clean:
ifeq ($(SHARED),1)
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_gcc$(VENDORTAG).dll: $(OGLDLL_OBJECTS) $(OBJS)\ogldll_version_rc.o
$(CXX) -shared -fPIC -o $@ $(OGLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.a $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
$(CXX) -shared -fPIC -o $@ $(OGLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.a $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
endif
ifeq ($(SHARED),0)
@@ -263,7 +263,7 @@ $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(
ranlib $@
endif
$(OBJS)\ogldll_dummy.o: ../../src/ogl/../../../src/msw/dummy.cpp
$(OBJS)\ogldll_dummy.o: ../../src/ogl/../../../src/common/dummy.cpp
$(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\ogldll_version_rc.o: ../../src/ogl/../../../src/msw/version.rc
@@ -305,7 +305,7 @@ $(OBJS)\ogldll_lines.o: ../../src/ogl/lines.cpp
$(OBJS)\ogldll_ogldiag.o: ../../src/ogl/ogldiag.cpp
$(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\ogllib_dummy.o: ../../src/ogl/../../../src/msw/dummy.cpp
$(OBJS)\ogllib_dummy.o: ../../src/ogl/../../../src/common/dummy.cpp
$(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\ogllib_basic2.o: ../../src/ogl/basic2.cpp

6
contrib/build/ogl/makefile.vc
View File

@@ -345,7 +345,7 @@ clean:
!if "$(SHARED)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_vc$(VENDORTAG).dll: $(OBJS)\ogldll_dummy.obj $(OGLDLL_OBJECTS) $(OBJS)\ogldll_version.res
link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
$(OGLDLL_OBJECTS) $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib
$(OGLDLL_OBJECTS) $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib
<<
!endif
@@ -357,7 +357,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
<<
!endif
$(OBJS)\ogldll_dummy.obj: ../../src/ogl\..\..\..\src\msw\dummy.cpp
$(OBJS)\ogldll_dummy.obj: ../../src/ogl\..\..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(OGLDLL_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\ogldll_version.res: ../../src/ogl\..\..\..\src\msw\version.rc
@@ -399,7 +399,7 @@ $(OBJS)\ogldll_lines.obj: ../../src/ogl\lines.cpp
$(OBJS)\ogldll_ogldiag.obj: ../../src/ogl\ogldiag.cpp
$(CXX) /c /nologo /TP /Fo$@ $(OGLDLL_CXXFLAGS) $**
$(OBJS)\ogllib_dummy.obj: ../../src/ogl\..\..\..\src\msw\dummy.cpp
$(OBJS)\ogllib_dummy.obj: ../../src/ogl\..\..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(OGLLIB_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\ogllib_basic2.obj: ../../src/ogl\basic2.cpp

6
contrib/build/ogl/makefile.wat
View File

@@ -291,7 +291,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
@%append $(OBJS)\ogldll.lbc option caseexact
@%append $(OBJS)\ogldll.lbc $(LDFLAGS) $(__DEBUGINFO_2) libpath $(LIBDIRNAME)
@for %i in ($(OGLDLL_OBJECTS)) do @%append $(OBJS)\ogldll.lbc file %i
@for %i in ( $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\ogldll.lbc library %i
@for %i in ( $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\ogldll.lbc library %i
@%append $(OBJS)\ogldll.lbc option resource=$(OBJS)\ogldll_version.res
@%append $(OBJS)\ogldll.lbc system nt_dll
wlink @$(OBJS)\ogldll.lbc
@@ -305,7 +305,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
wlib -q -p4096 -n -b $^@ @$(OBJS)\ogllib.lbc
!endif
$(OBJS)\ogldll_dummy.obj : .AUTODEPEND ../../src/ogl\..\..\..\src\msw\dummy.cpp
$(OBJS)\ogldll_dummy.obj : .AUTODEPEND ../../src/ogl\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
$(OBJS)\ogldll_version.res : .AUTODEPEND ../../src/ogl\..\..\..\src\msw\version.rc
@@ -347,7 +347,7 @@ $(OBJS)\ogldll_lines.obj : .AUTODEPEND ../../src/ogl\lines.cpp
$(OBJS)\ogldll_ogldiag.obj : .AUTODEPEND ../../src/ogl\ogldiag.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
$(OBJS)\ogllib_dummy.obj : .AUTODEPEND ../../src/ogl\..\..\..\src\msw\dummy.cpp
$(OBJS)\ogllib_dummy.obj : .AUTODEPEND ../../src/ogl\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
$(OBJS)\ogllib_basic2.obj : .AUTODEPEND ../../src/ogl\basic2.cpp

2
contrib/build/ogl/ogl.dsp
View File

@@ -484,7 +484,7 @@ SOURCE=../../src/ogl\drawn.cpp
# End Source File
# Begin Source File
SOURCE=../../src/ogl\..\..\..\src\msw\dummy.cpp
SOURCE=../../src/ogl\..\..\..\src\common\dummy.cpp
# ADD BASE CPP /Yc"wx/wxprec.h"
# ADD CPP /Yc"wx/wxprec.h"
# End Source File

6
contrib/build/plot/makefile.bcc
View File

@@ -238,7 +238,7 @@ clean:
!if "$(SHARED)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_bcc$(VENDORTAG).dll: $(OBJS)\plotdll_dummy.obj $(PLOTDLL_OBJECTS) $(OBJS)\plotdll_version.res
ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
c0d32.obj $(PLOTDLL_OBJECTS),$@,, $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32$(__THREADSFLAG_6)$(__RUNTIME_LIBS_9).lib,, $(OBJS)\plotdll_version.res
c0d32.obj $(PLOTDLL_OBJECTS),$@,, $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32$(__THREADSFLAG_6)$(__RUNTIME_LIBS_9).lib,, $(OBJS)\plotdll_version.res
|
implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot $@
!endif
@@ -251,7 +251,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
|
!endif
$(OBJS)\plotdll_dummy.obj: ../../src/plot\..\..\..\src\msw\dummy.cpp
$(OBJS)\plotdll_dummy.obj: ../../src/plot\..\..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(PLOTDLL_CXXFLAGS) -H $**
$(OBJS)\plotdll_version.res: ../../src/plot\..\..\..\src\msw\version.rc
@@ -260,7 +260,7 @@ $(OBJS)\plotdll_version.res: ../../src/plot\..\..\..\src\msw\version.rc
$(OBJS)\plotdll_plot.obj: ../../src/plot\plot.cpp
$(CXX) -q -c -P -o$@ $(PLOTDLL_CXXFLAGS) $**
$(OBJS)\plotlib_dummy.obj: ../../src/plot\..\..\..\src\msw\dummy.cpp
$(OBJS)\plotlib_dummy.obj: ../../src/plot\..\..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(PLOTLIB_CXXFLAGS) -H $**
$(OBJS)\plotlib_plot.obj: ../../src/plot\plot.cpp

6
contrib/build/plot/makefile.gcc
View File

@@ -232,7 +232,7 @@ clean:
ifeq ($(SHARED),1)
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_gcc$(VENDORTAG).dll: $(PLOTDLL_OBJECTS) $(OBJS)\plotdll_version_rc.o
$(CXX) -shared -fPIC -o $@ $(PLOTDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.a $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
$(CXX) -shared -fPIC -o $@ $(PLOTDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.a $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
endif
ifeq ($(SHARED),0)
@@ -242,7 +242,7 @@ $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(
ranlib $@
endif
$(OBJS)\plotdll_dummy.o: ../../src/plot/../../../src/msw/dummy.cpp
$(OBJS)\plotdll_dummy.o: ../../src/plot/../../../src/common/dummy.cpp
$(CXX) -c -o $@ $(PLOTDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\plotdll_version_rc.o: ../../src/plot/../../../src/msw/version.rc
@@ -251,7 +251,7 @@ $(OBJS)\plotdll_version_rc.o: ../../src/plot/../../../src/msw/version.rc
$(OBJS)\plotdll_plot.o: ../../src/plot/plot.cpp
$(CXX) -c -o $@ $(PLOTDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\plotlib_dummy.o: ../../src/plot/../../../src/msw/dummy.cpp
$(OBJS)\plotlib_dummy.o: ../../src/plot/../../../src/common/dummy.cpp
$(CXX) -c -o $@ $(PLOTLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\plotlib_plot.o: ../../src/plot/plot.cpp

6
contrib/build/plot/makefile.vc
View File

@@ -323,7 +323,7 @@ clean:
!if "$(SHARED)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_vc$(VENDORTAG).dll: $(OBJS)\plotdll_dummy.obj $(PLOTDLL_OBJECTS) $(OBJS)\plotdll_version.res
link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
$(PLOTDLL_OBJECTS) $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.lib
$(PLOTDLL_OBJECTS) $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.lib
<<
!endif
@@ -335,7 +335,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
<<
!endif
$(OBJS)\plotdll_dummy.obj: ../../src/plot\..\..\..\src\msw\dummy.cpp
$(OBJS)\plotdll_dummy.obj: ../../src/plot\..\..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(PLOTDLL_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\plotdll_version.res: ../../src/plot\..\..\..\src\msw\version.rc
@@ -344,7 +344,7 @@ $(OBJS)\plotdll_version.res: ../../src/plot\..\..\..\src\msw\version.rc
$(OBJS)\plotdll_plot.obj: ../../src/plot\plot.cpp
$(CXX) /c /nologo /TP /Fo$@ $(PLOTDLL_CXXFLAGS) $**
$(OBJS)\plotlib_dummy.obj: ../../src/plot\..\..\..\src\msw\dummy.cpp
$(OBJS)\plotlib_dummy.obj: ../../src/plot\..\..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(PLOTLIB_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\plotlib_plot.obj: ../../src/plot\plot.cpp

6
contrib/build/plot/makefile.wat
View File

@@ -269,7 +269,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
@%append $(OBJS)\plotdll.lbc option caseexact
@%append $(OBJS)\plotdll.lbc $(LDFLAGS) $(__DEBUGINFO_2) libpath $(LIBDIRNAME)
@for %i in ($(PLOTDLL_OBJECTS)) do @%append $(OBJS)\plotdll.lbc file %i
@for %i in ( $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\plotdll.lbc library %i
@for %i in ( $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\plotdll.lbc library %i
@%append $(OBJS)\plotdll.lbc option resource=$(OBJS)\plotdll_version.res
@%append $(OBJS)\plotdll.lbc system nt_dll
wlink @$(OBJS)\plotdll.lbc
@@ -283,7 +283,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
wlib -q -p4096 -n -b $^@ @$(OBJS)\plotlib.lbc
!endif
$(OBJS)\plotdll_dummy.obj : .AUTODEPEND ../../src/plot\..\..\..\src\msw\dummy.cpp
$(OBJS)\plotdll_dummy.obj : .AUTODEPEND ../../src/plot\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(PLOTDLL_CXXFLAGS) $<
$(OBJS)\plotdll_version.res : .AUTODEPEND ../../src/plot\..\..\..\src\msw\version.rc
@@ -292,7 +292,7 @@ $(OBJS)\plotdll_version.res : .AUTODEPEND ../../src/plot\..\..\..\src\msw\versi
$(OBJS)\plotdll_plot.obj : .AUTODEPEND ../../src/plot\plot.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(PLOTDLL_CXXFLAGS) $<
$(OBJS)\plotlib_dummy.obj : .AUTODEPEND ../../src/plot\..\..\..\src\msw\dummy.cpp
$(OBJS)\plotlib_dummy.obj : .AUTODEPEND ../../src/plot\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(PLOTLIB_CXXFLAGS) $<
$(OBJS)\plotlib_plot.obj : .AUTODEPEND ../../src/plot\plot.cpp

2
contrib/build/plot/plot.dsp
View File

@@ -452,7 +452,7 @@ LIB32=link.exe -lib
# PROP Default_Filter ""
# Begin Source File
SOURCE=../../src/plot\..\..\..\src\msw\dummy.cpp
SOURCE=../../src/plot\..\..\..\src\common\dummy.cpp
# ADD BASE CPP /Yc"wx/wxprec.h"
# ADD CPP /Yc"wx/wxprec.h"
# End Source File

2
contrib/build/stc/makefile.bcc
View File

@@ -394,7 +394,7 @@ clean:
!if "$(SHARED)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_bcc$(VENDORTAG).dll: $(STCDLL_OBJECTS) $(OBJS)\stcdll_version.res
ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
c0d32.obj $(STCDLL_OBJECTS),$@,, $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32$(__THREADSFLAG_6)$(__RUNTIME_LIBS_9).lib,, $(OBJS)\stcdll_version.res
c0d32.obj $(STCDLL_OBJECTS),$@,, $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32$(__THREADSFLAG_6)$(__RUNTIME_LIBS_9).lib,, $(OBJS)\stcdll_version.res
|
implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc $@
!endif

2
contrib/build/stc/makefile.gcc
View File

@@ -387,7 +387,7 @@ clean:
ifeq ($(SHARED),1)
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_gcc$(VENDORTAG).dll: $(STCDLL_OBJECTS) $(OBJS)\stcdll_version_rc.o
$(CXX) -shared -fPIC -o $@ $(STCDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.a $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
$(CXX) -shared -fPIC -o $@ $(STCDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.a $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
endif
ifeq ($(SHARED),0)

2
contrib/build/stc/makefile.vc
View File

@@ -479,7 +479,7 @@ clean:
!if "$(SHARED)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG).dll: $(STCDLL_OBJECTS) $(OBJS)\stcdll_version.res
link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
$(STCDLL_OBJECTS) $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib
$(STCDLL_OBJECTS) $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib
<<
!endif

2
contrib/build/stc/makefile.wat
View File

@@ -425,7 +425,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
@%append $(OBJS)\stcdll.lbc option caseexact
@%append $(OBJS)\stcdll.lbc $(LDFLAGS) $(__DEBUGINFO_2) libpath $(LIBDIRNAME)
@for %i in ($(STCDLL_OBJECTS)) do @%append $(OBJS)\stcdll.lbc file %i
@for %i in ( $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\stcdll.lbc library %i
@for %i in ( $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\stcdll.lbc library %i
@%append $(OBJS)\stcdll.lbc option resource=$(OBJS)\stcdll_version.res
@%append $(OBJS)\stcdll.lbc system nt_dll
wlink @$(OBJS)\stcdll.lbc

6
contrib/build/svg/makefile.bcc
View File

@@ -238,7 +238,7 @@ clean:
!if "$(SHARED)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg_bcc$(VENDORTAG).dll: $(OBJS)\svgdll_dummy.obj $(SVGDLL_OBJECTS) $(OBJS)\svgdll_version.res
ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
c0d32.obj $(SVGDLL_OBJECTS),$@,, $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32$(__THREADSFLAG_6)$(__RUNTIME_LIBS_9).lib,, $(OBJS)\svgdll_version.res
c0d32.obj $(SVGDLL_OBJECTS),$@,, $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32$(__THREADSFLAG_6)$(__RUNTIME_LIBS_9).lib,, $(OBJS)\svgdll_version.res
|
implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg $@
!endif
@@ -251,7 +251,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
|
!endif
$(OBJS)\svgdll_dummy.obj: ../../src/svg\..\..\..\src\msw\dummy.cpp
$(OBJS)\svgdll_dummy.obj: ../../src/svg\..\..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(SVGDLL_CXXFLAGS) -H $**
$(OBJS)\svgdll_version.res: ../../src/svg\..\..\..\src\msw\version.rc
@@ -260,7 +260,7 @@ $(OBJS)\svgdll_version.res: ../../src/svg\..\..\..\src\msw\version.rc
$(OBJS)\svgdll_dcsvg.obj: ../../src/svg\dcsvg.cpp
$(CXX) -q -c -P -o$@ $(SVGDLL_CXXFLAGS) $**
$(OBJS)\svglib_dummy.obj: ../../src/svg\..\..\..\src\msw\dummy.cpp
$(OBJS)\svglib_dummy.obj: ../../src/svg\..\..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(SVGLIB_CXXFLAGS) -H $**
$(OBJS)\svglib_dcsvg.obj: ../../src/svg\dcsvg.cpp

6
contrib/build/svg/makefile.gcc
View File

@@ -231,7 +231,7 @@ clean:
ifeq ($(SHARED),1)
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg_gcc$(VENDORTAG).dll: $(SVGDLL_OBJECTS) $(OBJS)\svgdll_version_rc.o
$(CXX) -shared -fPIC -o $@ $(SVGDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg.a $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
$(CXX) -shared -fPIC -o $@ $(SVGDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg.a $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
endif
ifeq ($(SHARED),0)
@@ -241,7 +241,7 @@ $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(
ranlib $@
endif
$(OBJS)\svgdll_dummy.o: ../../src/svg/../../../src/msw/dummy.cpp
$(OBJS)\svgdll_dummy.o: ../../src/svg/../../../src/common/dummy.cpp
$(CXX) -c -o $@ $(SVGDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\svgdll_version_rc.o: ../../src/svg/../../../src/msw/version.rc
@@ -250,7 +250,7 @@ $(OBJS)\svgdll_version_rc.o: ../../src/svg/../../../src/msw/version.rc
$(OBJS)\svgdll_dcsvg.o: ../../src/svg/dcsvg.cpp
$(CXX) -c -o $@ $(SVGDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\svglib_dummy.o: ../../src/svg/../../../src/msw/dummy.cpp
$(OBJS)\svglib_dummy.o: ../../src/svg/../../../src/common/dummy.cpp
$(CXX) -c -o $@ $(SVGLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\svglib_dcsvg.o: ../../src/svg/dcsvg.cpp

6
contrib/build/svg/makefile.vc
View File

@@ -323,7 +323,7 @@ clean:
!if "$(SHARED)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg_vc$(VENDORTAG).dll: $(OBJS)\svgdll_dummy.obj $(SVGDLL_OBJECTS) $(OBJS)\svgdll_version.res
link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
$(SVGDLL_OBJECTS) $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg.lib
$(SVGDLL_OBJECTS) $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg.lib
<<
!endif
@@ -335,7 +335,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
<<
!endif
$(OBJS)\svgdll_dummy.obj: ../../src/svg\..\..\..\src\msw\dummy.cpp
$(OBJS)\svgdll_dummy.obj: ../../src/svg\..\..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(SVGDLL_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\svgdll_version.res: ../../src/svg\..\..\..\src\msw\version.rc
@@ -344,7 +344,7 @@ $(OBJS)\svgdll_version.res: ../../src/svg\..\..\..\src\msw\version.rc
$(OBJS)\svgdll_dcsvg.obj: ../../src/svg\dcsvg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(SVGDLL_CXXFLAGS) $**
$(OBJS)\svglib_dummy.obj: ../../src/svg\..\..\..\src\msw\dummy.cpp
$(OBJS)\svglib_dummy.obj: ../../src/svg\..\..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(SVGLIB_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\svglib_dcsvg.obj: ../../src/svg\dcsvg.cpp

6
contrib/build/svg/makefile.wat
View File

@@ -269,7 +269,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
@%append $(OBJS)\svgdll.lbc option caseexact
@%append $(OBJS)\svgdll.lbc $(LDFLAGS) $(__DEBUGINFO_2) libpath $(LIBDIRNAME)
@for %i in ($(SVGDLL_OBJECTS)) do @%append $(OBJS)\svgdll.lbc file %i
@for %i in ( $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\svgdll.lbc library %i
@for %i in ( $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\svgdll.lbc library %i
@%append $(OBJS)\svgdll.lbc option resource=$(OBJS)\svgdll_version.res
@%append $(OBJS)\svgdll.lbc system nt_dll
wlink @$(OBJS)\svgdll.lbc
@@ -283,7 +283,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
wlib -q -p4096 -n -b $^@ @$(OBJS)\svglib.lbc
!endif
$(OBJS)\svgdll_dummy.obj : .AUTODEPEND ../../src/svg\..\..\..\src\msw\dummy.cpp
$(OBJS)\svgdll_dummy.obj : .AUTODEPEND ../../src/svg\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(SVGDLL_CXXFLAGS) $<
$(OBJS)\svgdll_version.res : .AUTODEPEND ../../src/svg\..\..\..\src\msw\version.rc
@@ -292,7 +292,7 @@ $(OBJS)\svgdll_version.res : .AUTODEPEND ../../src/svg\..\..\..\src\msw\version
$(OBJS)\svgdll_dcsvg.obj : .AUTODEPEND ../../src/svg\dcsvg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(SVGDLL_CXXFLAGS) $<
$(OBJS)\svglib_dummy.obj : .AUTODEPEND ../../src/svg\..\..\..\src\msw\dummy.cpp
$(OBJS)\svglib_dummy.obj : .AUTODEPEND ../../src/svg\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(SVGLIB_CXXFLAGS) $<
$(OBJS)\svglib_dcsvg.obj : .AUTODEPEND ../../src/svg\dcsvg.cpp

2
contrib/build/svg/svg.dsp
View File

@@ -456,7 +456,7 @@ SOURCE=../../src/svg\dcsvg.cpp
# End Source File
# Begin Source File
SOURCE=../../src/svg\..\..\..\src\msw\dummy.cpp
SOURCE=../../src/svg\..\..\..\src\common\dummy.cpp
# ADD BASE CPP /Yc"wx/wxprec.h"
# ADD CPP /Yc"wx/wxprec.h"
# End Source File