Skip to content

Commit

Permalink
Make it work under MSVC again after the code reorganization.
Browse files Browse the repository at this point in the history
  • Loading branch information
adah1972 committed May 14, 2015
1 parent a41b2cf commit fc60ccb
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 3 deletions.
5 changes: 5 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
2015-05-14 Wu Yongwei <wuyongwei@gmail.com>

* src/Makefile.msvc: Update for the new files unibreakbase.c,
unibreakbase.h, unibreakdef.c, and unibreakdef.h.

2015-05-10 Wu Yongwei <wuyongwei@gmail.com>

Update for the libunibreak 3.0 release.
Expand Down
38 changes: 35 additions & 3 deletions src/Makefile.msvc
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ CLEAN :
-@erase "$(INTDIR)\linebreakdata.obj"
-@erase "$(INTDIR)\linebreakdef.obj"
-@erase "$(INTDIR)\wordbreak.obj"
-@erase "$(INTDIR)\unibreakbase.obj"
-@erase "$(INTDIR)\unibreakdef.obj"
-@erase "$(INTDIR)\vc*.idb"
-@erase "$(OUTDIR)\unibreak.lib"

Expand All @@ -62,7 +64,9 @@ LIB32_OBJS= \
"$(INTDIR)\linebreak.obj" \
"$(INTDIR)\linebreakdata.obj" \
"$(INTDIR)\linebreakdef.obj" \
"$(INTDIR)\wordbreak.obj"
"$(INTDIR)\wordbreak.obj" \
"$(INTDIR)\unibreakbase.obj" \
"$(INTDIR)\unibreakdef.obj"

"$(OUTDIR)\unibreak.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
$(LIB32) @<<
Expand All @@ -85,6 +89,8 @@ CLEAN :
-@erase "$(INTDIR)\linebreakdata.obj"
-@erase "$(INTDIR)\linebreakdef.obj"
-@erase "$(INTDIR)\wordbreak.obj"
-@erase "$(INTDIR)\unibreakbase.obj"
-@erase "$(INTDIR)\unibreakdef.obj"
-@erase "$(INTDIR)\vc*.idb"
-@erase "$(INTDIR)\vc*.pdb"
-@erase "$(OUTDIR)\unibreak.lib"
Expand All @@ -103,7 +109,9 @@ LIB32_OBJS= \
"$(INTDIR)\linebreak.obj" \
"$(INTDIR)\linebreakdata.obj" \
"$(INTDIR)\linebreakdef.obj" \
"$(INTDIR)\wordbreak.obj"
"$(INTDIR)\wordbreak.obj" \
"$(INTDIR)\unibreakbase.obj" \
"$(INTDIR)\unibreakdef.obj"

"$(OUTDIR)\unibreak.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
$(LIB32) @<<
Expand Down Expand Up @@ -146,21 +154,35 @@ LIB32_OBJS= \
.\linebreak.c : \
".\linebreak.h"\
".\linebreakdef.h"\
".\unibreakbase.h"\
".\unibreakdef.h"\

.\linebreakdata.c : \
".\linebreak.h"\
".\linebreakdef.h"\
".\unibreakbase.h"\
".\unibreakdef.h"\

.\linebreakdef.c : \
".\linebreak.h"\
".\linebreakdef.h"\
".\unibreakbase.h"\
".\unibreakdef.h"\

.\wordbreak.c : \
".\linebreak.h"\
".\linebreakdef.h"\
".\wordbreak.h"\
".\wordbreakdef.h"\
".\wordbreakdata.c"\
".\unibreakbase.h"\
".\unibreakdef.h"\

.\unibreakbase.c : \
".\unibreakbase.h"\

.\unibreakdef.c : \
".\unibreakbase.h"\
".\unibreakdef.h"\


!IF "$(CFG)" == "libunibreak - Win32 Release" || "$(CFG)" == "libunibreak - Win32 Debug"
Expand All @@ -184,6 +206,16 @@ SOURCE=.\wordbreak.c
"$(INTDIR)\wordbreak.obj" : $(SOURCE) "$(INTDIR)"


SOURCE=.\unibreakbase.c

"$(INTDIR)\unibreakbase.obj" : $(SOURCE) "$(INTDIR)"


SOURCE=.\unibreakdef.c

"$(INTDIR)\unibreakdef.obj" : $(SOURCE) "$(INTDIR)"



!ENDIF

0 comments on commit fc60ccb

Please sign in to comment.