diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-05-22 01:10:24 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-05-22 01:10:24 +0300 |
| commit | 71e24025df24f71238b8140cc43ebc6c4b6b9de4 (patch) | |
| tree | 4dfb89f89c1962f79c9b687bd605a3cc1d1bb930 | |
| parent | 7317fd0c2850a6872fc6f9ee9e1905446d06f163 (diff) | |
Do build typesconfig also for Windows, but don't do anything there when using MSVC
| -rw-r--r-- | sal/prj/build.lst | 2 | ||||
| -rw-r--r-- | sal/typesconfig/makefile.mk | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/sal/prj/build.lst b/sal/prj/build.lst index 105cb19396d0..4de757265f80 100644 --- a/sal/prj/build.lst +++ b/sal/prj/build.lst @@ -1,7 +1,7 @@ sa sal : xml2cmp external BOOST:boost CPPUNIT:cppunit NULL sa sal usr1 - all sa_mkout NULL sa sal\inc nmake - all sa_inc NULL -sa sal\typesconfig nmake - u sa_tc sa_inc NULL +sa sal\typesconfig nmake - all sa_tc sa_inc NULL sa sal\cpprt nmake - u sa_cpprt sa_util sa_inc NULL sa sal\rtl\source nmake - all sa_rtl sa_tc.u sa_inc NULL sa sal\textenc nmake - all sa_textenc sa_tc.u sa_inc NULL diff --git a/sal/typesconfig/makefile.mk b/sal/typesconfig/makefile.mk index 084dc89cf479..ac106ab48852 100644 --- a/sal/typesconfig/makefile.mk +++ b/sal/typesconfig/makefile.mk @@ -42,17 +42,23 @@ CXXFLAGS+= $(LFS_CFLAGS) # --- Files -------------------------------------------------------- +.IF "$(CROSS_COMPILING)"=="" && "$(COM)"!="MSC" + APP1TARGET= $(TARGET) APP1OBJS= $(OBJ)$/typesconfig.obj APP1STDLIBS= APP1DEF= +.ENDIF + # --- Targets ------------------------------------------------------ .INCLUDE : target.mk .IF "$(L10N-framework)"=="" +.IF "$(COM)"!="MSC" ALLTAR : $(INCCOM)$/sal$/typesizes.h +.ENDIF .ENDIF # "$(L10N-framework)"=="" .IF "$(CROSS_COMPILING)"=="" |