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

Aparently someone modified templates/filelist.txt without committing.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18599 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2003-01-06 16:32:39 +00:00
parent 79597b2a4a
commit f58d1d9978
5 changed files with 54 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/msw/files.lst
View File

@@ -986,6 +986,7 @@ GUI_LOWLEVEL_OBJS = \
dcprint.o \ dcprint.o \
dcscreen.o \ dcscreen.o \
dde.o \ dde.o \
dialup.o \
dib.o \ dib.o \
evtloop.o \ evtloop.o \
font.o \ font.o \
@@ -993,8 +994,14 @@ GUI_LOWLEVEL_OBJS = \
fontutil.o \ fontutil.o \
gdiimage.o \ gdiimage.o \
gdiobj.o \ gdiobj.o \
glcanvas.o \
helpbest.o \
helpchm.o \
helpwin.o \
icon.o \ icon.o \
joystick.o \
main.o \ main.o \
minifram.o \
palette.o \ palette.o \
pen.o \ pen.o \
popupwin.o \ popupwin.o \
@@ -1003,11 +1010,14 @@ GUI_LOWLEVEL_OBJS = \
registry.o \ registry.o \
settings.o \ settings.o \
snglinst.o \ snglinst.o \
taskbar.o \
thread.o \ thread.o \
timer.o \ timer.o \
tooltip.o \
toplevel.o \ toplevel.o \
utils.o \ utils.o \
utilsexc.o \ utilsexc.o \
wave.o \
window.o window.o
HTMLOBJS = \ HTMLOBJS = \

30
src/msw/makefile.b32
View File

@@ -275,6 +275,7 @@ MSWUNIVOBJS = $(MSWDIR)\app.obj \
$(MSWDIR)\dcprint.obj \ $(MSWDIR)\dcprint.obj \
$(MSWDIR)\dcscreen.obj \ $(MSWDIR)\dcscreen.obj \
$(MSWDIR)\dde.obj \ $(MSWDIR)\dde.obj \
$(MSWDIR)\dialup.obj \
$(MSWDIR)\dib.obj \ $(MSWDIR)\dib.obj \
$(MSWDIR)\dir.obj \ $(MSWDIR)\dir.obj \
$(MSWDIR)\evtloop.obj \ $(MSWDIR)\evtloop.obj \
@@ -283,11 +284,17 @@ MSWUNIVOBJS = $(MSWDIR)\app.obj \
$(MSWDIR)\fontutil.obj \ $(MSWDIR)\fontutil.obj \
$(MSWDIR)\gdiimage.obj \ $(MSWDIR)\gdiimage.obj \
$(MSWDIR)\gdiobj.obj \ $(MSWDIR)\gdiobj.obj \
$(MSWDIR)\glcanvas.obj \
$(MSWDIR)\gsocket.obj \ $(MSWDIR)\gsocket.obj \
$(MSWDIR)\gsockmsw.obj \ $(MSWDIR)\gsockmsw.obj \
$(MSWDIR)\helpbest.obj \
$(MSWDIR)\helpchm.obj \
$(MSWDIR)\helpwin.obj \
$(MSWDIR)\icon.obj \ $(MSWDIR)\icon.obj \
$(MSWDIR)\joystick.obj \
$(MSWDIR)\main.obj \ $(MSWDIR)\main.obj \
$(MSWDIR)\mimetype.obj \ $(MSWDIR)\mimetype.obj \
$(MSWDIR)\minifram.obj \
$(MSWDIR)\palette.obj \ $(MSWDIR)\palette.obj \
$(MSWDIR)\pen.obj \ $(MSWDIR)\pen.obj \
$(MSWDIR)\popupwin.obj \ $(MSWDIR)\popupwin.obj \
@@ -296,12 +303,15 @@ MSWUNIVOBJS = $(MSWDIR)\app.obj \
$(MSWDIR)\registry.obj \ $(MSWDIR)\registry.obj \
$(MSWDIR)\settings.obj \ $(MSWDIR)\settings.obj \
$(MSWDIR)\snglinst.obj \ $(MSWDIR)\snglinst.obj \
$(MSWDIR)\taskbar.obj \
$(MSWDIR)\thread.obj \ $(MSWDIR)\thread.obj \
$(MSWDIR)\timer.obj \ $(MSWDIR)\timer.obj \
$(MSWDIR)\tooltip.obj \
$(MSWDIR)\toplevel.obj \ $(MSWDIR)\toplevel.obj \
$(MSWDIR)\utils.obj \ $(MSWDIR)\utils.obj \
$(MSWDIR)\utilsexc.obj \ $(MSWDIR)\utilsexc.obj \
$(MSWDIR)\volume.obj \ $(MSWDIR)\volume.obj \
$(MSWDIR)\wave.obj \
$(MSWDIR)\window.obj $(MSWDIR)\window.obj
UNIVOBJS = $(MSWDIR)\bmpbuttn.obj \ UNIVOBJS = $(MSWDIR)\bmpbuttn.obj \
@@ -600,6 +610,8 @@ $(MSWDIR)\dcscreen.obj: $(MSWDIR)\dcscreen.$(SRCSUFF)
$(MSWDIR)\dde.obj: $(MSWDIR)\dde.$(SRCSUFF) $(MSWDIR)\dde.obj: $(MSWDIR)\dde.$(SRCSUFF)
$(MSWDIR)\dialup.obj: $(MSWDIR)\dialup.$(SRCSUFF)
$(MSWDIR)\dib.obj: $(MSWDIR)\dib.$(SRCSUFF) $(MSWDIR)\dib.obj: $(MSWDIR)\dib.$(SRCSUFF)
$(MSWDIR)\dir.obj: $(MSWDIR)\dir.$(SRCSUFF) $(MSWDIR)\dir.obj: $(MSWDIR)\dir.$(SRCSUFF)
@@ -616,16 +628,28 @@ $(MSWDIR)\gdiimage.obj: $(MSWDIR)\gdiimage.$(SRCSUFF)
$(MSWDIR)\gdiobj.obj: $(MSWDIR)\gdiobj.$(SRCSUFF) $(MSWDIR)\gdiobj.obj: $(MSWDIR)\gdiobj.$(SRCSUFF)
$(MSWDIR)\glcanvas.obj: $(MSWDIR)\glcanvas.$(SRCSUFF)
$(MSWDIR)\gsocket.obj: $(MSWDIR)\gsocket.c $(MSWDIR)\gsocket.obj: $(MSWDIR)\gsocket.c
$(MSWDIR)\gsockmsw.obj: $(MSWDIR)\gsockmsw.c $(MSWDIR)\gsockmsw.obj: $(MSWDIR)\gsockmsw.c
$(MSWDIR)\helpbest.obj: $(MSWDIR)\helpbest.$(SRCSUFF)
$(MSWDIR)\helpchm.obj: $(MSWDIR)\helpchm.$(SRCSUFF)
$(MSWDIR)\helpwin.obj: $(MSWDIR)\helpwin.$(SRCSUFF)
$(MSWDIR)\icon.obj: $(MSWDIR)\icon.$(SRCSUFF) $(MSWDIR)\icon.obj: $(MSWDIR)\icon.$(SRCSUFF)
$(MSWDIR)\joystick.obj: $(MSWDIR)\joystick.$(SRCSUFF)
$(MSWDIR)\main.obj: $(MSWDIR)\main.$(SRCSUFF) $(MSWDIR)\main.obj: $(MSWDIR)\main.$(SRCSUFF)
$(MSWDIR)\mimetype.obj: $(MSWDIR)\mimetype.$(SRCSUFF) $(MSWDIR)\mimetype.obj: $(MSWDIR)\mimetype.$(SRCSUFF)
$(MSWDIR)\minifram.obj: $(MSWDIR)\minifram.$(SRCSUFF)
$(MSWDIR)\palette.obj: $(MSWDIR)\palette.$(SRCSUFF) $(MSWDIR)\palette.obj: $(MSWDIR)\palette.$(SRCSUFF)
$(MSWDIR)\pen.obj: $(MSWDIR)\pen.$(SRCSUFF) $(MSWDIR)\pen.obj: $(MSWDIR)\pen.$(SRCSUFF)
@@ -642,10 +666,14 @@ $(MSWDIR)\settings.obj: $(MSWDIR)\settings.$(SRCSUFF)
$(MSWDIR)\snglinst.obj: $(MSWDIR)\snglinst.$(SRCSUFF) $(MSWDIR)\snglinst.obj: $(MSWDIR)\snglinst.$(SRCSUFF)
$(MSWDIR)\taskbar.obj: $(MSWDIR)\taskbar.$(SRCSUFF)
$(MSWDIR)\thread.obj: $(MSWDIR)\thread.$(SRCSUFF) $(MSWDIR)\thread.obj: $(MSWDIR)\thread.$(SRCSUFF)
$(MSWDIR)\timer.obj: $(MSWDIR)\timer.$(SRCSUFF) $(MSWDIR)\timer.obj: $(MSWDIR)\timer.$(SRCSUFF)
$(MSWDIR)\tooltip.obj: $(MSWDIR)\tooltip.$(SRCSUFF)
$(MSWDIR)\toplevel.obj: $(MSWDIR)\toplevel.$(SRCSUFF) $(MSWDIR)\toplevel.obj: $(MSWDIR)\toplevel.$(SRCSUFF)
$(MSWDIR)\utils.obj: $(MSWDIR)\utils.$(SRCSUFF) $(MSWDIR)\utils.obj: $(MSWDIR)\utils.$(SRCSUFF)
@@ -654,6 +682,8 @@ $(MSWDIR)\utilsexc.obj: $(MSWDIR)\utilsexc.$(SRCSUFF)
$(MSWDIR)\volume.obj: $(MSWDIR)\volume.$(SRCSUFF) $(MSWDIR)\volume.obj: $(MSWDIR)\volume.$(SRCSUFF)
$(MSWDIR)\wave.obj: $(MSWDIR)\wave.$(SRCSUFF)
$(MSWDIR)\window.obj: $(MSWDIR)\window.$(SRCSUFF) $(MSWDIR)\window.obj: $(MSWDIR)\window.$(SRCSUFF)

3
src/msw/makefile.vc
View File

@@ -124,6 +124,7 @@ GENERICOBJS= $(GENDIR)\$D\busyinfo.obj \
# but sometimes it's useful to do so for testing purposes. # but sometimes it's useful to do so for testing purposes.
NONESSENTIALOBJS= $(GENDIR)\$D\colrdlgg.obj \ NONESSENTIALOBJS= $(GENDIR)\$D\colrdlgg.obj \
$(GENDIR)\$D\dirdlgg.obj \ $(GENDIR)\$D\dirdlgg.obj \
$(GENDIR)\$D\filedlgg.obj \
$(GENDIR)\$D\fontdlgg.obj \ $(GENDIR)\$D\fontdlgg.obj \
$(GENDIR)\$D\helpext.obj \ $(GENDIR)\$D\helpext.obj \
$(GENDIR)\$D\helphtml.obj \ $(GENDIR)\$D\helphtml.obj \
@@ -534,7 +535,7 @@ $(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS)
$(link) @<< $(link) @<<
$(LINKFLAGS) $(INCREMENTAL) $(LINKFLAGS) $(INCREMENTAL)
-out:$(WXDIR)\lib\$(WXLIBNAME).dll -out:$(WXDIR)\lib\$(WXLIBNAME).dll
$(DUMMYOBJ) $(OBJECTS) $(MSLU_LIBS) $(guilibsdll) shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib odbc32.lib advapi32.lib winmm.lib $(GL_LIBS) $(WXDIR)\lib\png$(LIBEXT).lib $(WXDIR)\lib\zlib$(LIBEXT).lib $(WXDIR)\lib\jpeg$(LIBEXT).lib $(WXDIR)\lib\tiff$(LIBEXT).lib $(WXDIR)\lib\regex$(LIBEXT).lib $(DELAY_LOAD) $(DUMMYOBJ) $(OBJECTS) $(MSLU_LIBS) $(guilibsdll) shell32.lib comctl32.lib ctl3d32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib odbc32.lib advapi32.lib winmm.lib $(GL_LIBS) $(WXDIR)\lib\png$(LIBEXT).lib $(WXDIR)\lib\zlib$(LIBEXT).lib $(WXDIR)\lib\jpeg$(LIBEXT).lib $(WXDIR)\lib\tiff$(LIBEXT).lib $(WXDIR)\lib\regex$(LIBEXT).lib $(DELAY_LOAD)
<< <<
!endif !endif

4
src/wxBase.dsp
View File

@@ -1014,6 +1014,10 @@ SOURCE=..\include\wx\msw\dde.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\include\wx\msw\gccpriv.h
# End Source File
# Begin Source File
SOURCE=..\include\wx\msw\mimetype.h SOURCE=..\include\wx\msw\mimetype.h
# End Source File # End Source File
# Begin Source File # Begin Source File

16
src/wxWindows.dsp
View File

@@ -58,8 +58,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo # ADD BASE BSC32 /nologo
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /dll /machine:I386 /out:"../lib/wxmsw250u.dll" # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /dll /machine:I386 /out:"../lib/wxmsw233u.dll"
# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /version:2.3 /dll /machine:I386 /out:"../lib/wxmsw250u.dll" # ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /version:2.3 /dll /machine:I386 /out:"../lib/wxmsw233u.dll"
!ELSEIF "$(CFG)" == "wxWindows - Win32 Debug Unicode DLL" !ELSEIF "$(CFG)" == "wxWindows - Win32 Debug Unicode DLL"
@@ -84,8 +84,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo # ADD BASE BSC32 /nologo
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxmsw250ud.dll" # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxmsw233ud.dll"
# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /nologo /version:2.3 /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxmsw250ud.dll" # ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /nologo /version:2.3 /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxmsw233ud.dll"
!ELSEIF "$(CFG)" == "wxWindows - Win32 Release Unicode" !ELSEIF "$(CFG)" == "wxWindows - Win32 Release Unicode"
@@ -156,8 +156,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo # ADD BASE BSC32 /nologo
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /dll /machine:I386 /out:"../lib/wxmsw250.dll" # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /dll /machine:I386 /out:"../lib/wxmsw233.dll"
# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /version:2.3 /dll /machine:I386 /out:"../lib/wxmsw250.dll" # ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /version:2.3 /dll /machine:I386 /out:"../lib/wxmsw233.dll"
!ELSEIF "$(CFG)" == "wxWindows - Win32 Debug DLL" !ELSEIF "$(CFG)" == "wxWindows - Win32 Debug DLL"
@@ -182,8 +182,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo # ADD BASE BSC32 /nologo
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxmsw250d.dll" # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxmsw233d.dll"
# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /nologo /version:2.3 /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxmsw250d.dll" # ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /nologo /version:2.3 /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxmsw233d.dll"
!ELSEIF "$(CFG)" == "wxWindows - Win32 Release" !ELSEIF "$(CFG)" == "wxWindows - Win32 Release"