X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/16a12a3d27d3d3e2557bcde15365245ef2675bb4..5e84fc5a820a15a1ce2d32d2ae71f0bf92abda3d:/src/os2/makefile.va diff --git a/src/os2/makefile.va b/src/os2/makefile.va index e10f25fdc6..aee9ec8309 100644 --- a/src/os2/makefile.va +++ b/src/os2/makefile.va @@ -52,6 +52,18 @@ COMMDIR=$(WXDIR)\src\common OS2DIR=$(WXDIR)\src\os2 HTMLDIR = $(WXDIR)\src\html +!if [md $(COMMDIR)\$D] +!endif + +!if [md $(OS2DIR)\$D] +!endif + +!if [md $(GENDIR)\$D] +!endif + +!if [md $(HTMLDIR)\$D] +!endif + {..\generic}.cpp{..\generic\$D}.obj: @echo $< icc @<< @@ -208,6 +220,7 @@ COMMONOBJS = \ ..\common\$D\longlong.obj \ ..\common\$D\matrix.obj \ ..\common\$D\memory.obj \ + ..\common\$D\menucmn.obj \ ..\common\$D\mimetype.obj \ ..\common\$D\module.obj \ ..\common\$D\mstream.obj \ @@ -307,6 +320,7 @@ COMLIBOBJS2 = \ longlong.obj \ matrix.obj \ memory.obj \ + menucmn.obj \ mimetype.obj \ module.obj \ mstream.obj \ @@ -340,10 +354,10 @@ COMLIBOBJS2 = \ url.obj \ utilscmn.obj \ valgen.obj \ - validate.obj \ - valtext.obj + validate.obj COMLIBOBJS3 = \ + valtext.obj \ variant.obj \ wfstream.obj \ wincmn.obj \ @@ -522,7 +536,6 @@ HTMLOBJS = \ ..\html\$D\m_list.obj \ ..\html\$D\m_pre.obj \ ..\html\$D\m_tables.obj \ - ..\html\$D\search.obj \ ..\html\$D\winpars.obj HTMLLIBOBJS = \ @@ -542,14 +555,13 @@ HTMLLIBOBJS = \ m_list.obj \ m_pre.obj \ m_tables.obj \ - search.obj \ winpars.obj # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc. OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(NONESSENTIALOBJS) $(OS2OBJS) # Normal, static library -all: $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET) +all: $(OBJECTS) $(PERIPH_TARGET) png zlib xpm jpeg $(LIBTARGET) dirs: $(OS2DIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(HTMLDIR)\$D @@ -557,21 +569,6 @@ dirs: $(OS2DIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(HTMLDIR)\$D test: $(OS2DIR)\$D\wave.obj test2: ..\common\Debug\config.obj -$D: - md $D - -$(COMMDIR)\$D: - md $(COMMDIR)\$D - -$(OS2DIR)\$D: - md $(OS2DIR)\$D - -$(GENDIR)\$D: - md $(GENDIR)\$D - -$(HTMLDIR)\$D: - md $(HTMLDIR)\$D - $(COMLIBOBJS1): copy ..\common\$D\appcmn.obj copy ..\common\$D\choiccmn.obj @@ -627,6 +624,7 @@ $(COMLIBOBJS2): copy ..\common\$D\longlong.obj copy ..\common\$D\matrix.obj copy ..\common\$D\memory.obj + copy ..\common\$D\menucmn.obj copy ..\common\$D\mimetype.obj copy ..\common\$D\module.obj copy ..\common\$D\mstream.obj @@ -661,10 +659,10 @@ $(COMLIBOBJS2): copy ..\common\$D\utilscmn.obj copy ..\common\$D\valgen.obj copy ..\common\$D\validate.obj - copy ..\common\$D\valtext.obj - copy ..\common\$D\variant.obj $(COMLIBOBJS3): + copy ..\common\$D\valtext.obj + copy ..\common\$D\variant.obj copy ..\common\$D\wfstream.obj copy ..\common\$D\wincmn.obj copy ..\common\$D\wxchar.obj @@ -722,7 +720,6 @@ $(HTMLLIBOBJS): copy ..\html\$D\m_list.obj copy ..\html\$D\m_pre.obj copy ..\html\$D\m_tables.obj - copy ..\html\$D\search.obj copy ..\html\$D\winpars.obj $(OS2LIBOBJS1): @@ -972,20 +969,60 @@ $(OBJECTS): $(WXDIR)/include/wx/setup.h $(CPPFLAGS2) /Fo$@ $(COMMDIR)\unzip.c << +png: + cd $(WXDIR)\src\png + nmake -f makefile.va FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) + cd $(WXDIR)\src\os2 + +clean_png: + cd $(WXDIR)\src\png + nmake -f makefile.va clean + cd $(WXDIR)\src\os2 + +zlib: + cd $(WXDIR)\src\zlib + nmake -f makefile.va FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) + cd $(WXDIR)\src\os2 + +clean_zlib: + cd $(WXDIR)\src\zlib + nmake -f makefile.va clean + cd $(WXDIR)\src\os2 + +jpeg: + cd $(WXDIR)\src\jpeg + nmake -f makefile.va FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) + cd $(WXDIR)\src\os2 + +clean_jpeg: + cd $(WXDIR)\src\jpeg + nmake -f makefile.va clean + cd $(WXDIR)\src\os2 + +xpm: + cd $(WXDIR)\src\xpm + nmake -f makefile.va FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) + cd $(WXDIR)\src\os2 + +clean_xpm: + cd $(WXDIR)\src\xpm + nmake -f makefile.va clean + cd $(WXDIR)\src\os2 + clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_jpeg clean_xpm - -erase $(LIBTARGET) - -erase ..\..\lib\wx200.dll - -erase ..\..\lib\wx200.lib - -erase $(GENDIR)\$D\*.obj - -erase $(COMMDIR)\$D\*.obj - -erase $(COMMDIR)\\y_tab.c - -erase $(COMMDIR)\lex_yy.c - -erase $(OS2DIR)\$D\*.obj - -rmdir $(D) - -rmdir ..\generic\$(D) - -rmdir ..\common\$(D) - -rmdir ..\html\$(D) - -rmdir ..\os2\$(D) + del $(LIBTARGET) + erase /N ..\..\lib\wx200.dll + erase /N ..\..\lib\wx200.lib + erase /N $(GENDIR)\$D\*.obj + erase /N $(COMMDIR)\$D\*.obj + erase /N $(COMMDIR)\\y_tab.c + erase /N $(COMMDIR)\lex_yy.c + erase /N $(OS2DIR)\$D\*.obj + rd $(D) + rd ..\generic\$(D) + rd ..\common\$(D) + rd ..\html\$(D) + rd ..\os2\$(D) cleanall: clean