reverted Julians changes to the pragmas

[wxWidgets.git] / src / mac / files.lst

diff --git a/src/mac/files.lst b/src/mac/files.lst
index e216740999ed73f82442cf75737744557d6d95fe..5678c6509e698891f731b4cb26b601672aa64604 100644 (file)
--- a/src/mac/files.lst
+++ b/src/mac/files.lst
@@ -28,7 +28,7 @@ ALL_SOURCES = \
                generic/propform.cpp \
                generic/proplist.cpp \
                generic/sashwin.cpp \
-               generic/scrolwin.cpp \
+               generic/scrlwing.cpp \
                generic/splash.cpp \
                generic/splitter.cpp \
                generic/statusbr.cpp \
@@ -42,6 +42,7 @@ ALL_SOURCES = \
                common/choiccmn.cpp \
                common/clipcmn.cpp \
                common/cmdline.cpp \
+               common/cmdproc.cpp \
                common/cmndata.cpp \
                common/config.cpp \
                common/cshelp.cpp \
@@ -90,6 +91,7 @@ ALL_SOURCES = \
                common/imagpng.cpp \
                common/imagpnm.cpp \
                common/imagtiff.cpp \
+               common/imagxpm.cpp \
                common/intl.cpp \
                common/ipcbase.cpp \
                common/layout.cpp \
@@ -102,6 +104,7 @@ ALL_SOURCES = \
                common/mimecmn.cpp \
                common/module.cpp \
                common/mstream.cpp \
+               common/nbkbase.cpp \
                common/object.cpp \
                common/objstrm.cpp \
                common/paper.cpp \
@@ -138,6 +141,7 @@ ALL_SOURCES = \
                common/wincmn.cpp \
                common/wxchar.cpp \
                common/wxexpr.cpp \
+               common/xpmdecod.cpp \
                common/zipstrm.cpp \
                common/zstream.cpp \
                html/helpctrl.cpp \
@@ -179,6 +183,7 @@ ALL_HEADERS = \
                choice.h \
                clipbrd.h \
                cmdline.h \
+               cmdproc.h \
                cmndata.h \
                colordlg.h \
                colour.h \
@@ -259,6 +264,7 @@ ALL_HEADERS = \
                imagpng.h \
                imagpnm.h \
                imagtiff.h \
+               imagxpm.h \
                intl.h \
                ioswrap.h \
                ipcbase.h \
@@ -365,6 +371,7 @@ ALL_HEADERS = \
                wx_cw_d.h \
                wxchar.h \
                wxexpr.h \
+               xpmdecod.h \
                wxhtml.h \
                wxprec.h \
                xpmhand.h \
@@ -427,6 +434,7 @@ COMMONOBJS = \
                choiccmn.o \
                clipcmn.o \
                cmdline.o \
+               cmdproc.o \
                cmndata.o \
                config.o \
                cshelp.o \
@@ -476,6 +484,7 @@ COMMONOBJS = \
                imagpng.o \
                imagpnm.o \
                imagtiff.o \
+               imagxpm.o \
                intl.o \
                ipcbase.o \
                layout.o \
@@ -489,6 +498,7 @@ COMMONOBJS = \
                mimecmn.o \
                module.o \
                mstream.o \
+               nbkbase.o \
                object.o \
                objstrm.o \
                paper.o \
@@ -525,6 +535,7 @@ COMMONOBJS = \
                wincmn.o \
                wxchar.o \
                wxexpr.o \
+               xpmdecod.o \
                zipstrm.o \
                zstream.o
 
@@ -582,6 +593,7 @@ COMMONDEPS = \
                imagpng.d \
                imagpnm.d \
                imagtiff.d \
+               imagxpm.d \
                intl.d \
                ipcbase.d \
                layout.d \
@@ -630,6 +642,7 @@ COMMONDEPS = \
                wincmn.d \
                wxchar.d \
                wxexpr.d \
+               xpmdecod.d \
                zipstrm.d \
                zstream.d
 
@@ -722,7 +735,6 @@ GENERICDEPS = \
 # Not included for Mac OS X
 #              dirmac.o
 #              filedlg.o
-#              notebook.o
 #              statline.o
 #              treectrl.o
 GUIOBJS = \
@@ -873,8 +885,8 @@ GUIDEPS = \
 #              gsocket.o
 #              mimetype.o
 #              threadpsx.o
+#              dialup.o
 UNIXOBJS = \
-               dialup.o \
                utilsunx.o \
                dl_macosx.o
 
@@ -933,3 +945,8 @@ HTMLDEPS = \
                m_tables.d \
                winpars.d
 
+MACRESOURCES = \
+               apprsrc.r \
+               carbrsrc.r \
+               corersrc.r
+