fix
git-svn-id: http://svn2.nishi.boats/svn/milsko/trunk@294 b9cfdab3-6d41-4d17-bbe4-086880011989
This commit is contained in:
parent
d83e92b228
commit
f79b7469b7
3 changed files with 6 additions and 5 deletions
|
|
@ -62,14 +62,14 @@ clean:
|
|||
del /f /q oosrc\MwOO.dll
|
||||
|
||||
src\Mw.dll: src\core.obj src\draw.obj src\default.obj src\lowlevel.obj src\error.obj src\unicode.obj src\font.obj src\color.obj src\messagebox.obj src\boldfont.obj src\external\ds.obj src\external\image.obj src\icon\info.obj src\icon\note.obj src\icon\warning.obj src\icon\error.obj src\icon\news.obj src\icon\question.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.obj src\widget\button.obj src\widget\frame.obj src\widget\opengl.obj src\widget\window.obj src\widget\menu.obj src\widget\entry.obj src\widget\submenu.obj src\widget\image.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\label.obj src\widget\numberentry.obj src\widget\viewport.obj src\backend\gdi.obj
|
||||
$(LD) $(LDFLAGS) -e$@ src\core.obj src\draw.obj src\default.obj src\lowlevel.obj src\error.obj src\unicode.obj src\font.obj src\color.obj src\messagebox.obj src\boldfont.obj src\external\ds.obj src\external\image.obj src\icon\info.obj src\icon\note.obj src\icon\warning.obj src\icon\error.obj src\icon\news.obj src\icon\question.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.obj src\widget\button.obj src\widget\frame.obj src\widget\opengl.obj src\widget\window.obj src\widget\menu.obj src\widget\entry.obj src\widget\submenu.obj src\widget\image.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\label.obj src\widget\numberentry.obj src\widget\viewport.obj src\backend\gdi.obj gdi32.lib user32.lib
|
||||
$(LD) $(LDFLAGS) -e$@ src\core.obj src\draw.obj src\default.obj src\lowlevel.obj src\error.obj src\unicode.obj src\font.obj src\color.obj src\messagebox.obj src\boldfont.obj src\external\ds.obj src\external\image.obj src\icon\info.obj src\icon\note.obj src\icon\warning.obj src\icon\error.obj src\icon\news.obj src\icon\question.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.obj src\widget\button.obj src\widget\frame.obj src\widget\opengl.obj src\widget\window.obj src\widget\menu.obj src\widget\entry.obj src\widget\submenu.obj src\widget\image.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\label.obj src\widget\numberentry.obj src\widget\viewport.obj src\backend\gdi.obj -lgdi32.lib -luser32.lib
|
||||
implib src\Mw.lib src\Mw.dll
|
||||
|
||||
oosrc\MwOO.dll: oosrc\base.obj oosrc\widget\button.obj oosrc\widget\frame.obj oosrc\widget\image.obj oosrc\widget\menu.obj oosrc\widget\opengl.obj oosrc\widget\scrollbar.obj oosrc\widget\submenu.obj oosrc\widget\window.obj oosrc\widget\checkbox.obj oosrc\widget\viewport.obj oosrc\widget\label.obj oosrc\widget\entry.obj oosrc\widget\numberentry.obj
|
||||
$(LD) $(LDFLAGS) -e$@ oosrc\base.obj oosrc\widget\button.obj oosrc\widget\frame.obj oosrc\widget\image.obj oosrc\widget\menu.obj oosrc\widget\opengl.obj oosrc\widget\scrollbar.obj oosrc\widget\submenu.obj oosrc\widget\window.obj oosrc\widget\checkbox.obj oosrc\widget\viewport.obj oosrc\widget\label.obj oosrc\widget\entry.obj oosrc\widget\numberentry.obj src\Mw.lib
|
||||
$(LD) $(LDFLAGS) -e$@ oosrc\base.obj oosrc\widget\button.obj oosrc\widget\frame.obj oosrc\widget\image.obj oosrc\widget\menu.obj oosrc\widget\opengl.obj oosrc\widget\scrollbar.obj oosrc\widget\submenu.obj oosrc\widget\window.obj oosrc\widget\checkbox.obj oosrc\widget\viewport.obj oosrc\widget\label.obj oosrc\widget\entry.obj oosrc\widget\numberentry.obj -lsrc\Mw.lib
|
||||
implib oosrc\MwOO.lib oosrc\MwOO.dll
|
||||
|
||||
.c.obj:
|
||||
$(CC) $(CFLAGS) -o$@ $<
|
||||
.cxx.obj:
|
||||
.cc.obj:
|
||||
$(CXX) $(CXXFLAGS) -o$@ $<
|
||||
|
|
|
|||
|
|
@ -71,5 +71,5 @@ oosrc\MwOO.dll: oosrc\base.obj oosrc\widget\button.obj oosrc\widget\frame.obj o
|
|||
|
||||
.c.obj:
|
||||
$(CC) $(CFLAGS) /Fo$@ $<
|
||||
.cxx.obj:
|
||||
.cc.obj:
|
||||
$(CXX) $(CXXFLAGS) /Fo$@ $<
|
||||
|
|
|
|||
|
|
@ -77,6 +77,7 @@ sub generate {
|
|||
$def = "-D";
|
||||
$inc = "-I";
|
||||
$dll = "-tWD";
|
||||
$lib = "-l";
|
||||
|
||||
$c_dllafter = "implib src${dir}Mw.lib src${dir}Mw.dll";
|
||||
$cxx_dllafter = "implib oosrc${dir}MwOO.lib oosrc${dir}MwOO.dll";
|
||||
|
|
@ -151,7 +152,7 @@ sub generate {
|
|||
if($suffix){
|
||||
print(OUT ".c.obj:\n");
|
||||
print(OUT " \$(CC) \$(CFLAGS) ${out}\$@ \$<\n");
|
||||
print(OUT ".cxx.obj:\n");
|
||||
print(OUT ".cc.obj:\n");
|
||||
print(OUT " \$(CXX) \$(CXXFLAGS) ${out}\$@ \$<\n");
|
||||
}else{
|
||||
print(OUT "\n");
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue