Update Mkfiles to add new cpp module.

svn path=/trunk/yasm/; revision=1968

diff --git a/Mkfiles/Makefile.dj b/Mkfiles/Makefile.dj
index dff9b6d402662fe83ed160e9e7eb4646cab0a705..ffb48fecc795a45127f09e062049ca39aa466b74 100644 (file)
--- a/Mkfiles/Makefile.dj
+++ b/Mkfiles/Makefile.dj
@@ -125,9 +125,14 @@ MODULES_PREPROCS_RAW_OBJS = \
  modules/preprocs/raw/raw-preproc.o
 YASM_MODULES+=preproc_raw
 
+MODULES_PREPROCS_CPP_OBJS = \
+ modules/preprocs/cpp/cpp-preproc.o
+YASM_MODULES+=preproc_cpp
+
 MODULES_PREPROCS_OBJS = \
  $(MODULES_PREPROCS_NASM_OBJS) \
- $(MODULES_PREPROCS_RAW_OBJS)
+ $(MODULES_PREPROCS_RAW_OBJS) \
+ $(MODULES_PREPROCS_CPP_OBJS)
 
 MODULES_OBJS = \
  $(MODULES_ARCH_OBJS) \

diff --git a/Mkfiles/Makefile.flat b/Mkfiles/Makefile.flat
index 42ddd69133b17a6090494136a04f69b3d146c277..b138e4b64d3b157e9157ba99645ed8047fc5b954 100644 (file)
--- a/Mkfiles/Makefile.flat
+++ b/Mkfiles/Makefile.flat
@@ -128,9 +128,14 @@ MODULES_PREPROCS_RAW_OBJS = \
  modules/preprocs/raw/raw-preproc.o
 YASM_MODULES+=preproc_raw
 
+MODULES_PREPROCS_CPP_OBJS = \
+ modules/preprocs/cpp/cpp-preproc.o
+YASM_MODULES+=preproc_cpp
+
 MODULES_PREPROCS_OBJS = \
  $(MODULES_PREPROCS_NASM_OBJS) \
- $(MODULES_PREPROCS_RAW_OBJS)
+ $(MODULES_PREPROCS_RAW_OBJS) \
+ $(MODULES_PREPROCS_CPP_OBJS)
 
 MODULES_OBJS = \
  $(MODULES_ARCH_OBJS) \

diff --git a/Mkfiles/vc/modules/modules.vcproj b/Mkfiles/vc/modules/modules.vcproj
index 6d043ed0ef2f77d3d5295192e257451f3a43da21..5fe66b20500b3c5ed2527d5cc7c9f51c6ba360d7 100644 (file)
--- a/Mkfiles/vc/modules/modules.vcproj
+++ b/Mkfiles/vc/modules/modules.vcproj
@@ -310,6 +310,13 @@
                                                RelativePath="..\..\..\modules\preprocs\raw\raw-preproc.c">\r
                                        </File>\r
                                </Filter>\r
+                               <Filter\r
+                                       Name="cpp"\r
+                                       Filter="">\r
+                                       <File\r
+                                               RelativePath="..\..\..\modules\preprocs\cpp\cpp-preproc.c">\r
+                                       </File>\r
+                               </Filter>\r
                        </Filter>\r
                        <Filter\r
                                Name="listfmts"\r

diff --git a/Mkfiles/vc8/modules/modules.vcproj b/Mkfiles/vc8/modules/modules.vcproj
index d5b3965a8e90865b7a5d066d91ce913f6c03aded..380247232865ce41ed4c7ce5991c798797dc1e8d 100644 (file)
--- a/Mkfiles/vc8/modules/modules.vcproj
+++ b/Mkfiles/vc8/modules/modules.vcproj
@@ -565,6 +565,14 @@
                                                >\r
                                        </File>\r
                                </Filter>\r
+                               <Filter\r
+                                       Name="cpp"\r
+                                       >\r
+                                       <File\r
+                                               RelativePath="..\..\..\modules\preprocs\cpp\cpp-preproc.c"\r
+                                               >\r
+                                       </File>\r
+                               </Filter>\r
                        </Filter>\r
                        <Filter\r
                                Name="listfmts"\r