gephex--release--0.4.3--patch-1
[email protected] Sat, 23 Apr 2005 18:03:33 +0200 (CEST)
| Newsgroups | gmane.comp.video.gephex.devel |
|---|---|
| Message-ID | <[email protected]> |
Archive: [email protected] New revision: gephex--release--0.4.3--patch-1 -- Revision: gephex--release--0.4.3--patch-1 Archive: [email protected] Creator: The Gephex Source Archive <[email protected]> Date: Sat Apr 23 18:00:57 CEST 2005 Standard-date: 2005-04-23 16:00:57 GMT Removed-files: base/src/interfaces/.arch-ids/moduleclassloadercontrol.if.id base/src/interfaces/.arch-ids/typeclassloadercontrol.if.id base/src/interfaces/.arch-ids/typeclassname.if.id base/src/interfaces/moduleclassloadercontrol.if base/src/interfaces/typeclassloadercontrol.if base/src/interfaces/typeclassname.if qtgui/src/gui/dialogs/.arch-ids/dllselectordialog.cpp.id qtgui/src/gui/dialogs/.arch-ids/dllselectordialog.h.id qtgui/src/gui/dialogs/dllselectordialog.cpp qtgui/src/gui/dialogs/dllselectordialog.h Modified-files: NEWS base/src/interfaces/Makefile.am base/src/interfaces/interfaces.dep base/src/interfaces/interfaces.dsp base/src/interfaces/interfaces.mak base/src/netinterfaces/Makefile.am base/src/netinterfaces/netinterfaces.dep base/src/netinterfaces/netinterfaces.dsp base/src/netinterfaces/netinterfaces.mak contrib/Makefile.am effectvmodules/src/effectv1dmodule/effectv1dmodule.xpm effectvmodules/src/effectvshagadelicmodule/effectvshagadelicmodule.xpm engine/src/dllloader/c_module.cpp engine/src/dllloader/c_module.h engine/src/dllloader/c_moduleclass.cpp engine/src/dllloader/c_moduleclass.h engine/src/dllloader/dllloader.cpp engine/src/dllloader/dllloader.dep engine/src/dllloader/dllloader.h engine/src/dllloader/typedllloader.cpp engine/src/dllloader/typedllloader.h engine/src/engine/controller.cpp engine/src/engine/controller.h engine/src/model/model.dep engine/src/renderer/renderer.h qtgui/src/gui/dialogs/Makefile.am qtgui/src/gui/dialogs/changesdialogimpl.cpp qtgui/src/gui/dialogs/dialogs.dep qtgui/src/gui/dialogs/dialogs.dsp qtgui/src/gui/dialogs/dialogs.mak qtgui/src/gui/gui.dep qtgui/src/gui/vjmainwindow.cpp qtgui/src/gui/vjmainwindow.h qtgui/src/guimodel/enginewrapper.cpp qtgui/src/guimodel/enginewrapper.h qtgui/src/guimodel/guimodel.dep New-patches: [email protected]/gephex--georg--0.4--patch-408 [email protected]/gephex--georg--0.4--patch-409 [email protected]/gephex--georg--0.4--patch-410 [email protected]/gephex--georg--0.4--patch-411 [email protected]/gephex--georg--0.4--patch-412 [email protected]/gephex--georg--0.4--patch-413 [email protected]/gephex--main--0.4--patch-1878 [email protected]/gephex--main--0.4--patch-1879 [email protected]/gephex--main--0.4--patch-1880 [email protected]/gephex--release--0.4.3--patch-1 [email protected]/gephex--frei0r--0.4--patch-2 [email protected]/gephex--frei0r--0.4--patch-3 [email protected]/gephex--frei0r--0.4--patch-4 [email protected]/gephex--frei0r--0.4--patch-5 [email protected]/gephex--frei0r--0.4--patch-6 [email protected]/gephex--frei0r--0.4--patch-7 [email protected]/gephex--frei0r--0.4--patch-8 [email protected]/gephex--frei0r--0.4--patch-9 [email protected]/gephex--frei0r--0.4--patch-10 Summary: Sync with main for last bug fixes and changes Keywords: * removed files base/src/interfaces/.arch-ids/moduleclassloadercontrol.if.id base/src/interfaces/.arch-ids/typeclassloadercontrol.if.id base/src/interfaces/.arch-ids/typeclassname.if.id base/src/interfaces/moduleclassloadercontrol.if base/src/interfaces/typeclassloadercontrol.if base/src/interfaces/typeclassname.if qtgui/src/gui/dialogs/.arch-ids/dllselectordialog.cpp.id qtgui/src/gui/dialogs/.arch-ids/dllselectordialog.h.id qtgui/src/gui/dialogs/dllselectordialog.cpp qtgui/src/gui/dialogs/dllselectordialog.h * added files {arch}/gephex/gephex--frei0r/gephex--frei0r--0.4/[email protected]/patch-log/patch-10 {arch}/gephex/gephex--frei0r/gephex--frei0r--0.4/[email protected]/patch-log/patch-2 {arch}/gephex/gephex--frei0r/gephex--frei0r--0.4/[email protected]/patch-log/patch-3 {arch}/gephex/gephex--frei0r/gephex--frei0r--0.4/[email protected]/patch-log/patch-4 {arch}/gephex/gephex--frei0r/gephex--frei0r--0.4/[email protected]/patch-log/patch-5 {arch}/gephex/gephex--frei0r/gephex--frei0r--0.4/[email protected]/patch-log/patch-6 {arch}/gephex/gephex--frei0r/gephex--frei0r--0.4/[email protected]/patch-log/patch-7 {arch}/gephex/gephex--frei0r/gephex--frei0r--0.4/[email protected]/patch-log/patch-8 {arch}/gephex/gephex--frei0r/gephex--frei0r--0.4/[email protected]/patch-log/patch-9 {arch}/gephex/gephex--georg/gephex--georg--0.4/[email protected]/patch-log/patch-408 {arch}/gephex/gephex--georg/gephex--georg--0.4/[email protected]/patch-log/patch-409 {arch}/gephex/gephex--georg/gephex--georg--0.4/[email protected]/patch-log/patch-410 {arch}/gephex/gephex--georg/gephex--georg--0.4/[email protected]/patch-log/patch-411 {arch}/gephex/gephex--georg/gephex--georg--0.4/[email protected]/patch-log/patch-412 {arch}/gephex/gephex--georg/gephex--georg--0.4/[email protected]/patch-log/patch-413 {arch}/gephex/gephex--main/gephex--main--0.4/[email protected]/patch-log/patch-1878 {arch}/gephex/gephex--main/gephex--main--0.4/[email protected]/patch-log/patch-1879 {arch}/gephex/gephex--main/gephex--main--0.4/[email protected]/patch-log/patch-1880 {arch}/gephex/gephex--release/gephex--release--0.4.3/[email protected]/patch-log/patch-1 * file metadata changed ./base/src/interfaces/interfaces.dep --permissions 755 => --permissions 644 ./base/src/netinterfaces/netinterfaces.dep --permissions 755 => --permissions 644 ./engine/src/model/model.dep --permissions 755 => --permissions 644 ./qtgui/src/gui/dialogs/dialogs.dep --permissions 755 => --permissions 644 ./qtgui/src/guimodel/guimodel.dep --permissions 755 => --permissions 644 * modified files --- orig/NEWS +++ mod/NEWS @@ -3,17 +3,18 @@ * support for Mac OS X (experimental) - * ports of almost all effecTV effects - * initial OSC support (experimental) + * ports of almost all effecTV effects + * some usability improvements * some documentation improvements - * fixed bugs #78, #79, #80, #81, #82, #83, #84, #85, #86, #87, #88, #89, + * fixed bugs #78, #79, #80, #81, #82, #83, #84, #85, #86, #87, #88, #89, #90 #92 #96, #97, #100, #102, #103, #112, #113, #114, #115, #116 + 0.4.2: ------ --- orig/base/src/interfaces/Makefile.am +++ mod/base/src/interfaces/Makefile.am @@ -7,7 +7,6 @@ modelstatus.if \ moduleclass.if \ moduleclassinfo.if \ - moduleclassloadercontrol.if \ moduleclassname.if \ moduleclassspec.if \ moduleconstructiondumb.if \ @@ -21,9 +20,7 @@ serializedgraph.if \ smartcontrolvalue.if \ typeclass.if \ - typeclassinfo.if \ - typeclassloadercontrol.if \ - typeclassname.if + typeclassinfo.if EXTRA_DIST = interfaces.dsp interfaces.mak interfaces.dep $(INTERFACE_FILES) --- orig/base/src/interfaces/interfaces.dep +++ mod/base/src/interfaces/interfaces.dep @@ -132,21 +132,3 @@ !ENDIF -!IF "$(CFG)" == "interfaces - Win32 Release" - -!ELSEIF "$(CFG)" == "interfaces - Win32 Debug" - -!ENDIF - -!IF "$(CFG)" == "interfaces - Win32 Release" - -!ELSEIF "$(CFG)" == "interfaces - Win32 Debug" - -!ENDIF - -!IF "$(CFG)" == "interfaces - Win32 Release" - -!ELSEIF "$(CFG)" == "interfaces - Win32 Debug" - -!ENDIF - --- orig/base/src/interfaces/interfaces.dsp +++ mod/base/src/interfaces/interfaces.dsp @@ -508,49 +508,6 @@ # End Source File # Begin Source File -SOURCE=.\moduleclassloadercontrol.if - -!IF "$(CFG)" == "interfaces - Win32 Release" - -# Begin Custom Build -InputPath=.\moduleclassloadercontrol.if -InputName=moduleclassloadercontrol - -BuildCmds= \ - python ../../nic.py is . $(InputPath) \ - python ../../nic.py ir . $(InputPath) \ - - -"i$(InputName)sender.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) - -"i$(InputName)receiver.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) -# End Custom Build - -!ELSEIF "$(CFG)" == "interfaces - Win32 Debug" - -# Begin Custom Build - Creating interface headers for $(InputPath) ... -InputPath=.\moduleclassloadercontrol.if -InputName=moduleclassloadercontrol - -BuildCmds= \ - python ../../nic.py is . $(InputPath) \ - python ../../nic.py ir . $(InputPath) \ - - -"i$(InputName)sender.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) - -"i$(InputName)receiver.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) -# End Custom Build - -!ENDIF - -# End Source File -# Begin Source File - SOURCE=.\moduleclassname.if !IF "$(CFG)" == "interfaces - Win32 Release" @@ -1108,92 +1065,6 @@ !ENDIF # End Source File -# Begin Source File - -SOURCE=. ypeclassloadercontrol.if - -!IF "$(CFG)" == "interfaces - Win32 Release" - -# Begin Custom Build -InputPath=. ypeclassloadercontrol.if -InputName=typeclassloadercontrol - -BuildCmds= \ - python ../../nic.py is . $(InputPath) \ - python ../../nic.py ir . $(InputPath) \ - - -"i$(InputName)sender.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) - -"i$(InputName)receiver.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) -# End Custom Build - -!ELSEIF "$(CFG)" == "interfaces - Win32 Debug" - -# Begin Custom Build - Creating interface headers for $(InputPath) ... -InputPath=. ypeclassloadercontrol.if -InputName=typeclassloadercontrol - -BuildCmds= \ - python ../../nic.py is . $(InputPath) \ - python ../../nic.py ir . $(InputPath) \ - - -"i$(InputName)sender.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) - -"i$(InputName)receiver.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) -# End Custom Build - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=. ypeclassname.if - -!IF "$(CFG)" == "interfaces - Win32 Release" - -# Begin Custom Build -InputPath=. ypeclassname.if -InputName=typeclassname - -BuildCmds= \ - python ../../nic.py is . $(InputPath) \ - python ../../nic.py ir . $(InputPath) \ - - -"i$(InputName)sender.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) - -"i$(InputName)receiver.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) -# End Custom Build - -!ELSEIF "$(CFG)" == "interfaces - Win32 Debug" - -# Begin Custom Build - Creating interface headers for $(InputPath) ... -InputPath=. ypeclassname.if -InputName=typeclassname - -BuildCmds= \ - python ../../nic.py is . $(InputPath) \ - python ../../nic.py ir . $(InputPath) \ - - -"i$(InputName)sender.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) - -"i$(InputName)receiver.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) -# End Custom Build - -!ENDIF - -# End Source File # End Group # Begin Group "Autocreated Headers" --- orig/base/src/interfaces/interfaces.mak +++ mod/base/src/interfaces/interfaces.mak @@ -25,13 +25,16 @@ NULL=nul !ENDIF +CPP=cl.exe +RSC=rc.exe + !IF "$(CFG)" == "interfaces - Win32 Release" OUTDIR=.\../../lib INTDIR=.\Release -ALL : ".\itypeclasssender.h" ".\itypeclassreceiver.h" ".\itypeclassnamesender.h" ".\itypeclassnamereceiver.h" ".\itypeclassloadercontrolsender.h" ".\itypeclassloadercontrolreceiver.h" ".\itypeclassinfosender.h" ".\itypeclassinforeceiver.h" ".\ismartcontrolvaluesender.h" ".\ismartcontrolvaluereceiver.h" ".\iserializedgraphsender.h" ".\iserializedgraphreceiver.h" ".\irendererstatussender.h" ".\irendererstatusreceiver.h" ".\irenderercontrolsender.h" ".\irenderercontrolreceiver.h" ".\imodulestatisticssmartsender.h" ".\imodulestatisticssmartreceiver.h" ".\imodulestatisticssender.h" ".\imodulestatisticsreceiver.h" ".\imoduledatasender.h" ".\imoduledatareceiver.h" ".\imoduleconstructionsmartsender.h" ".\imoduleconstructionsmartreceiver.h" ".\imoduleconstructiondumbsender.h" ".\imoduleconstructiondumbreceiver.h" ".\imoduleclassspecsender.h" ".\imoduleclassspecreceiver.h" ".\imoduleclasssender.h " ".\imoduleclassreceiver.h" ".\imoduleclassnamesender.h" ".\imoduleclassnamereceiver.h" ".\imoduleclassloadercontrolsender.h" ".\imoduleclassloadercontrolreceiver.h" ".\imoduleclassinfosender.h" ".\imoduleclassinforeceiver.h" ".\imodelstatussender.h" ".\imodelstatusreceiver.h"\ - ".\imodelcontrolsender.h" ".\imodelcontrolreceiver.h" ".\igraphnamesender.h" ".\igraphnamereceiver.h" ".\igraphdatasender.h" ".\igraphdatareceiver.h" ".\ierrorsender.h" ".\ierrorreceiver.h" ".\ienginecontrolsender.h" ".\ienginecontrolreceiver.h" ".\icontrolvaluesender.h" ".\icontrolvaluereceiver.h" +ALL : ".\itypeclasssender.h" ".\itypeclassreceiver.h" ".\itypeclassinfosender.h" ".\itypeclassinforeceiver.h" ".\ismartcontrolvaluesender.h" ".\ismartcontrolvaluereceiver.h" ".\iserializedgraphsender.h" ".\iserializedgraphreceiver.h" ".\irendererstatussender.h" ".\irendererstatusreceiver.h" ".\irenderercontrolsender.h" ".\irenderercontrolreceiver.h" ".\imodulestatisticssmartsender.h" ".\imodulestatisticssmartreceiver.h" ".\imodulestatisticssender.h" ".\imodulestatisticsreceiver.h" ".\imoduledatasender.h" ".\imoduledatareceiver.h" ".\imoduleconstructionsmartsender.h" ".\imoduleconstructionsmartreceiver.h" ".\imoduleconstructiondumbsender.h" ".\imoduleconstructiondumbreceiver.h" ".\imoduleclassspecsender.h" ".\imoduleclassspecreceiver.h" ".\imoduleclasssender.h" ".\imoduleclassreceiver.h" ".\imoduleclassnamesender.h" ".\imoduleclassnamereceiver.h" ".\imoduleclassinfosender.h" ".\imodulecl assinforeceiver.h" ".\imodelstatussender.h" ".\imodelstatusreceiver.h" ".\imodelcontrolsender.h" ".\imodelcontrolreceiver.h" ".\igraphnamesender.h" ".\igraphnamereceiver.h" ".\igraphdatasender.h" ".\igraphdatareceiver.h" ".\ierrorsender.h" ".\ierrorreceiver.h" ".\ienginecontrolsender.h"\ + ".\ienginecontrolreceiver.h" ".\icontrolvaluesender.h" ".\icontrolvaluereceiver.h" CLEAN : @@ -52,8 +55,6 @@ -@erase "imodelstatussender.h" -@erase "imoduleclassinforeceiver.h" -@erase "imoduleclassinfosender.h" - -@erase "imoduleclassloadercontrolreceiver.h" - -@erase "imoduleclassloadercontrolsender.h" -@erase "imoduleclassnamereceiver.h" -@erase "imoduleclassnamesender.h" -@erase "imoduleclassreceiver.h" @@ -80,10 +81,6 @@ -@erase "ismartcontrolvaluesender.h" -@erase "itypeclassinforeceiver.h" -@erase "itypeclassinfosender.h" - -@erase "itypeclassloadercontrolreceiver.h" - -@erase "itypeclassloadercontrolsender.h" - -@erase "itypeclassnamereceiver.h" - -@erase "itypeclassnamesender.h" -@erase "itypeclassreceiver.h" -@erase "itypeclasssender.h" @@ -93,40 +90,7 @@ "$(INTDIR)" : if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)" -CPP=cl.exe CPP_PROJ=/nologo /G6 /MD /w /W0 /GX /O2 /I "../../../util/src/include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /Fp"$(INTDIR)\interfaces.pch" /YX /Fo"$(INTDIR)\" /Fd"$(INTDIR)\" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\interfaces.bsc" BSC32_SBRS= \ @@ -141,8 +105,8 @@ OUTDIR=.\../../lib INTDIR=.\Debug -ALL : ".\itypeclasssender.h" ".\itypeclassreceiver.h" ".\itypeclassnamesender.h" ".\itypeclassnamereceiver.h" ".\itypeclassloadercontrolsender.h" ".\itypeclassloadercontrolreceiver.h" ".\itypeclassinfosender.h" ".\itypeclassinforeceiver.h" ".\ismartcontrolvaluesender.h" ".\ismartcontrolvaluereceiver.h" ".\iserializedgraphsender.h" ".\iserializedgraphreceiver.h" ".\irendererstatussender.h" ".\irendererstatusreceiver.h" ".\irenderercontrolsender.h" ".\irenderercontrolreceiver.h" ".\imodulestatisticssmartsender.h" ".\imodulestatisticssmartreceiver.h" ".\imodulestatisticssender.h" ".\imodulestatisticsreceiver.h" ".\imoduledatasender.h" ".\imoduledatareceiver.h" ".\imoduleconstructionsmartsender.h" ".\imoduleconstructionsmartreceiver.h" ".\imoduleconstructiondumbsender.h" ".\imoduleconstructiondumbreceiver.h" ".\imoduleclassspecsender.h" ".\imoduleclassspecreceiver.h" ".\imoduleclasssender.h " ".\imoduleclassreceiver.h" ".\imoduleclassnamesender.h" ".\imoduleclassnamereceiver.h" ".\imoduleclassloadercontrolsender.h" ".\imoduleclassloadercontrolreceiver.h" ".\imoduleclassinfosender.h" ".\imoduleclassinforeceiver.h" ".\imodelstatussender.h" ".\imodelstatusreceiver.h"\ - ".\imodelcontrolsender.h" ".\imodelcontrolreceiver.h" ".\igraphnamesender.h" ".\igraphnamereceiver.h" ".\igraphdatasender.h" ".\igraphdatareceiver.h" ".\ierrorsender.h" ".\ierrorreceiver.h" ".\ienginecontrolsender.h" ".\ienginecontrolreceiver.h" ".\icontrolvaluesender.h" ".\icontrolvaluereceiver.h" +ALL : ".\itypeclasssender.h" ".\itypeclassreceiver.h" ".\itypeclassinfosender.h" ".\itypeclassinforeceiver.h" ".\ismartcontrolvaluesender.h" ".\ismartcontrolvaluereceiver.h" ".\iserializedgraphsender.h" ".\iserializedgraphreceiver.h" ".\irendererstatussender.h" ".\irendererstatusreceiver.h" ".\irenderercontrolsender.h" ".\irenderercontrolreceiver.h" ".\imodulestatisticssmartsender.h" ".\imodulestatisticssmartreceiver.h" ".\imodulestatisticssender.h" ".\imodulestatisticsreceiver.h" ".\imoduledatasender.h" ".\imoduledatareceiver.h" ".\imoduleconstructionsmartsender.h" ".\imoduleconstructionsmartreceiver.h" ".\imoduleconstructiondumbsender.h" ".\imoduleconstructiondumbreceiver.h" ".\imoduleclassspecsender.h" ".\imoduleclassspecreceiver.h" ".\imoduleclasssender.h" ".\imoduleclassreceiver.h" ".\imoduleclassnamesender.h" ".\imoduleclassnamereceiver.h" ".\imoduleclassinfosender.h" ".\imodulecl assinforeceiver.h" ".\imodelstatussender.h" ".\imodelstatusreceiver.h" ".\imodelcontrolsender.h" ".\imodelcontrolreceiver.h" ".\igraphnamesender.h" ".\igraphnamereceiver.h" ".\igraphdatasender.h" ".\igraphdatareceiver.h" ".\ierrorsender.h" ".\ierrorreceiver.h" ".\ienginecontrolsender.h"\ + ".\ienginecontrolreceiver.h" ".\icontrolvaluesender.h" ".\icontrolvaluereceiver.h" CLEAN : @@ -163,8 +127,6 @@ -@erase "imodelstatussender.h" -@erase "imoduleclassinforeceiver.h" -@erase "imoduleclassinfosender.h" - -@erase "imoduleclassloadercontrolreceiver.h" - -@erase "imoduleclassloadercontrolsender.h" -@erase "imoduleclassnamereceiver.h" -@erase "imoduleclassnamesender.h" -@erase "imoduleclassreceiver.h" @@ -191,10 +153,6 @@ -@erase "ismartcontrolvaluesender.h" -@erase "itypeclassinforeceiver.h" -@erase "itypeclassinfosender.h" - -@erase "itypeclassloadercontrolreceiver.h" - -@erase "itypeclassloadercontrolsender.h" - -@erase "itypeclassnamereceiver.h" - -@erase "itypeclassnamesender.h" -@erase "itypeclassreceiver.h" -@erase "itypeclasssender.h" @@ -204,8 +162,17 @@ "$(INTDIR)" : if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)" -CPP=cl.exe CPP_PROJ=/nologo /G6 /MTd /W3 /Gm /GX /ZI /Od /I "../../../util/include" /D "WIN32" /D "_DEBUG" /D for="if (0) {} else for" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /Fp"$(INTDIR)\interfaces.pch" /YX /Fo"$(INTDIR)\" /Fd"$(INTDIR)\" /FD /GZ /c +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\interfaces.bsc" +BSC32_SBRS= \ + +LIB32=link.exe -lib +LIB32_FLAGS=/nologo /out:"$(OUTDIR)\interfaces.lib" +LIB32_OBJS= \ + + +!ENDIF .c{$(INTDIR)}.obj:: $(CPP) @<< @@ -237,18 +204,6 @@ $(CPP_PROJ) $< << -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\interfaces.bsc" -BSC32_SBRS= \ - -LIB32=link.exe -lib -LIB32_FLAGS=/nologo /out:"$(OUTDIR)\interfaces.lib" -LIB32_OBJS= \ - - -!ENDIF - !IF "$(NO_EXTERNAL_DEPS)" != "1" !IF EXISTS("interfaces.dep") @@ -530,36 +485,6 @@ !ENDIF -SOURCE=.\moduleclassloadercontrol.if - -!IF "$(CFG)" == "interfaces - Win32 Release" - -InputPath=.\moduleclassloadercontrol.if -InputName=moduleclassloadercontrol - -".\imoduleclassloadercontrolsender.h" ".\imoduleclassloadercontrolreceiver.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - <<tempfile.bat - @echo off - python ../../nic.py is . $(InputPath) - python ../../nic.py ir . $(InputPath) -<< - - -!ELSEIF "$(CFG)" == "interfaces - Win32 Debug" - -InputPath=.\moduleclassloadercontrol.if -InputName=moduleclassloadercontrol - -".\imoduleclassloadercontrolsender.h" ".\imoduleclassloadercontrolreceiver.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - <<tempfile.bat - @echo off - python ../../nic.py is . $(InputPath) - python ../../nic.py ir . $(InputPath) -<< - - -!ENDIF - SOURCE=.\moduleclassname.if !IF "$(CFG)" == "interfaces - Win32 Release" @@ -950,66 +875,6 @@ !ENDIF -SOURCE=. ypeclassloadercontrol.if - -!IF "$(CFG)" == "interfaces - Win32 Release" - -InputPath=. ypeclassloadercontrol.if -InputName=typeclassloadercontrol - -".\itypeclassloadercontrolsender.h" ".\itypeclassloadercontrolreceiver.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - <<tempfile.bat - @echo off - python ../../nic.py is . $(InputPath) - python ../../nic.py ir . $(InputPath) -<< - - -!ELSEIF "$(CFG)" == "interfaces - Win32 Debug" - -InputPath=. ypeclassloadercontrol.if -InputName=typeclassloadercontrol - -".\itypeclassloadercontrolsender.h" ".\itypeclassloadercontrolreceiver.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - <<tempfile.bat - @echo off - python ../../nic.py is . $(InputPath) - python ../../nic.py ir . $(InputPath) -<< - - -!ENDIF - -SOURCE=. ypeclassname.if - -!IF "$(CFG)" == "interfaces - Win32 Release" - -InputPath=. ypeclassname.if -InputName=typeclassname - -".\itypeclassnamesender.h" ".\itypeclassnamereceiver.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - <<tempfile.bat - @echo off - python ../../nic.py is . $(InputPath) - python ../../nic.py ir . $(InputPath) -<< - - -!ELSEIF "$(CFG)" == "interfaces - Win32 Debug" - -InputPath=. ypeclassname.if -InputName=typeclassname - -".\itypeclassnamesender.h" ".\itypeclassnamereceiver.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - <<tempfile.bat - @echo off - python ../../nic.py is . $(InputPath) - python ../../nic.py ir . $(InputPath) -<< - - -!ENDIF - !ENDIF --- orig/base/src/netinterfaces/Makefile.am +++ mod/base/src/netinterfaces/Makefile.am @@ -7,15 +7,11 @@ libnetinterfaces_a_SOURCES = \ enginecontrolsendernet.cpp \ enginecontrolreceivernet.cpp \ - moduleclassloadercontrolsendernet.cpp \ - moduleclassloadercontrolreceivernet.cpp \ renderercontrolreceivernet.cpp \ renderercontrolsendernet.cpp \ modelcontrolreceivernet.cpp \ moduledatareceivernet.cpp \ moduledatasendernet.cpp \ - moduleclassnamereceivernet.cpp \ - moduleclassnamesendernet.cpp \ moduleconstructiondumbreceivernet.cpp \ modelcontrolsendernet.cpp \ moduleconstructiondumbsendernet.cpp \ @@ -49,10 +45,6 @@ modelcontrolsendernet.h \ moduleclassinforeceivernet.h \ moduleclassinfosendernet.h \ - moduleclassloadercontrolreceivernet.h \ - moduleclassloadercontrolsendernet.h \ - moduleclassnamereceivernet.h \ - moduleclassnamesendernet.h \ moduleconstructiondumbreceivernet.h \ moduleconstructiondumbsendernet.h \ moduledatareceivernet.h \ --- orig/base/src/netinterfaces/netinterfaces.dep +++ mod/base/src/netinterfaces/netinterfaces.dep @@ -168,27 +168,6 @@ ".\moduleclassinfosendernet.h"\ -.\moduleclassloadercontrolreceivernet.cpp : \ - "..\interfaces\imoduleclassloadercontrolreceiver.h"\ - ".. et\idatalistener.h"\ - ".. et\isender.h"\ - ".. et\itagger.h"\ - "..\utilsufferstream.h"\ - "..\utilsufferutils.h"\ - "..\utils\string_.h"\ - ".\moduleclassloadercontrolreceivernet.h"\ - - -.\moduleclassloadercontrolsendernet.cpp : \ - "..\interfaces\imoduleclassloadercontrolreceiver.h"\ - "..\interfaces\imoduleclassloadercontrolsender.h"\ - ".. et\itaginterpreter.h"\ - "..\utilsufferstream.h"\ - "..\utilsufferutils.h"\ - "..\utils\string_.h"\ - ".\moduleclassloadercontrolsendernet.h"\ - - .\moduleclassnamereceivernet.cpp : \ "..\interfaces\imoduleclassnamereceiver.h"\ ".. et\idatalistener.h"\ @@ -447,21 +426,3 @@ !ENDIF -!IF "$(CFG)" == "netinterfaces - Win32 Release" - -!ELSEIF "$(CFG)" == "netinterfaces - Win32 Debug" - -!ENDIF - -!IF "$(CFG)" == "netinterfaces - Win32 Release" - -!ELSEIF "$(CFG)" == "netinterfaces - Win32 Debug" - -!ENDIF - -!IF "$(CFG)" == "netinterfaces - Win32 Release" - -!ELSEIF "$(CFG)" == "netinterfaces - Win32 Debug" - -!ENDIF - --- orig/base/src/netinterfaces/netinterfaces.dsp +++ mod/base/src/netinterfaces/netinterfaces.dsp @@ -149,14 +149,6 @@ # End Source File # Begin Source File -SOURCE=.\moduleclassloadercontrolreceivernet.cpp -# End Source File -# Begin Source File - -SOURCE=.\moduleclassloadercontrolsendernet.cpp -# End Source File -# Begin Source File - SOURCE=.\moduleclassnamereceivernet.cpp # End Source File # Begin Source File @@ -868,65 +860,6 @@ # End Source File # Begin Source File -SOURCE=..\interfaces\moduleclassloadercontrol.if - -!IF "$(CFG)" == "netinterfaces - Win32 Release" - -# Begin Custom Build -InputPath=..\interfaces\moduleclassloadercontrol.if -InputName=moduleclassloadercontrol - -BuildCmds= \ - python ../../nic.py nrh . $(InputPath) \ - python ../../nic.py nrc . $(InputPath) \ - python ../../nic.py nsh . $(InputPath) \ - python ../../nic.py nsc . $(InputPath) \ - - -"$(InputName)receivernet.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) - -"$(InputName)receivernet.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) - -"$(InputName)sendernet.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) - -"$(InputName)sendernet.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) -# End Custom Build - -!ELSEIF "$(CFG)" == "netinterfaces - Win32 Debug" - -# Begin Custom Build - Creating netinterface headers and implementations for $(InputPath) ... -InputPath=..\interfaces\moduleclassloadercontrol.if -InputName=moduleclassloadercontrol - -BuildCmds= \ - python ../../nic.py nrh . $(InputPath) \ - python ../../nic.py nrc . $(InputPath) \ - python ../../nic.py nsh . $(InputPath) \ - python ../../nic.py nsc . $(InputPath) \ - - -"$(InputName)receivernet.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) - -"$(InputName)receivernet.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) - -"$(InputName)sendernet.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) - -"$(InputName)sendernet.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) -# End Custom Build - -!ENDIF - -# End Source File -# Begin Source File - SOURCE=..\interfaces\moduleclassname.if !IF "$(CFG)" == "netinterfaces - Win32 Release" @@ -1692,124 +1625,6 @@ !ENDIF # End Source File -# Begin Source File - -SOURCE=..\interfaces ypeclassloadercontrol.if - -!IF "$(CFG)" == "netinterfaces - Win32 Release" - -# Begin Custom Build -InputPath=..\interfaces ypeclassloadercontrol.if -InputName=typeclassloadercontrol - -BuildCmds= \ - python ../../nic.py nrh . $(InputPath) \ - python ../../nic.py nrc . $(InputPath) \ - python ../../nic.py nsh . $(InputPath) \ - python ../../nic.py nsc . $(InputPath) \ - - -"$(InputName)receivernet.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) - -"$(InputName)receivernet.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) - -"$(InputName)sendernet.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) - -"$(InputName)sendernet.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) -# End Custom Build - -!ELSEIF "$(CFG)" == "netinterfaces - Win32 Debug" - -# Begin Custom Build - Creating netinterface headers and implementations for $(InputPath) ... -InputPath=..\interfaces ypeclassloadercontrol.if -InputName=typeclassloadercontrol - -BuildCmds= \ - python ../../nic.py nrh . $(InputPath) \ - python ../../nic.py nrc . $(InputPath) \ - python ../../nic.py nsh . $(InputPath) \ - python ../../nic.py nsc . $(InputPath) \ - - -"$(InputName)receivernet.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) - -"$(InputName)receivernet.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) - -"$(InputName)sendernet.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) - -"$(InputName)sendernet.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) -# End Custom Build - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\interfaces ypeclassname.if - -!IF "$(CFG)" == "netinterfaces - Win32 Release" - -# Begin Custom Build -InputPath=..\interfaces ypeclassname.if -InputName=typeclassname - -BuildCmds= \ - python ../../nic.py nrh . $(InputPath) \ - python ../../nic.py nrc . $(InputPath) \ - python ../../nic.py nsh . $(InputPath) \ - python ../../nic.py nsc . $(InputPath) \ - - -"$(InputName)receivernet.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) - -"$(InputName)receivernet.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) - -"$(InputName)sendernet.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) - -"$(InputName)sendernet.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) -# End Custom Build - -!ELSEIF "$(CFG)" == "netinterfaces - Win32 Debug" - -# Begin Custom Build - Creating netinterface headers and implementations for $(InputPath) ... -InputPath=..\interfaces ypeclassname.if -InputName=typeclassname - -BuildCmds= \ - python ../../nic.py nrh . $(InputPath) \ - python ../../nic.py nrc . $(InputPath) \ - python ../../nic.py nsh . $(InputPath) \ - python ../../nic.py nsc . $(InputPath) \ - - -"$(InputName)receivernet.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) - -"$(InputName)receivernet.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) - -"$(InputName)sendernet.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) - -"$(InputName)sendernet.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) -# End Custom Build - -!ENDIF - -# End Source File # End Group # End Target # End Project --- orig/base/src/netinterfaces/netinterfaces.mak +++ mod/base/src/netinterfaces/netinterfaces.mak @@ -25,6 +25,9 @@ NULL=nul !ENDIF +CPP=cl.exe +RSC=rc.exe + !IF "$(CFG)" == "netinterfaces - Win32 Release" OUTDIR=.\../../lib @@ -33,8 +36,9 @@ OutDir=.\../../lib # End Custom Macros -ALL : ". ypeclasssendernet.h" ". ypeclasssendernet.cpp" ". ypeclassreceivernet.h" ". ypeclassreceivernet.cpp" ". ypeclassnamesendernet.h" ". ypeclassnamesendernet.cpp" ". ypeclassnamereceivernet.h" ". ypeclassnamereceivernet.cpp" ". ypeclassloadercontrolsendernet.h" ". ypeclassloadercontrolsendernet.cpp" ". ypeclassloadercontrolreceivernet.h" ". ypeclassloadercontrolreceivernet.cpp" ". ypeclassinfosendernet.h" ". ypeclassinfosendernet.cpp" ". ypeclassinforeceivernet.h" ". ypeclassinforeceivernet.cpp" ".\smartcontrolvaluesendernet.h" ".\smartcontrolvaluesendernet.cpp" ".\smartcontrolvaluereceivernet.h" ".\smartcontrolvaluereceivernet.cpp" ".\serializedgraphsendernet.h" ".\serializedgraphsendernet.cpp" ".\serializedgraphreceivernet.h" ".\serializedgraphreceivernet.cpp" ".\modulestatisticssmartsendernet.h" ".\modulestatisticssmartsendernet.cpp" ".\modulestatisticssmartreceivernet.h" ".\mod ulestatisticssmartreceivernet.cpp" ".\moduleconstructionsmartsendernet.h" ".\moduleconstructionsmartsendernet.cpp" ".\moduleconstructionsmartreceivernet.h" ".\moduleconstructionsmartreceivernet.cpp" ".\moduleclassspecsendernet.h" ".\moduleclassspecsendernet.cpp"\ - ".\moduleclassspecreceivernet.h" ".\moduleclassspecreceivernet.cpp" ".\moduleclasssendernet.h" ".\moduleclasssendernet.cpp" ".\moduleclassreceivernet.h" ".\moduleclassreceivernet.cpp" "$(OUTDIR) etinterfaces.lib" +ALL : ". ypeclasssendernet.h" ". ypeclasssendernet.cpp" ". ypeclassreceivernet.h" ". ypeclassreceivernet.cpp" ". ypeclassinfosendernet.h" ". ypeclassinfosendernet.cpp" ". ypeclassinforeceivernet.h" ". ypeclassinforeceivernet.cpp" ".\smartcontrolvaluesendernet.h" ".\smartcontrolvaluesendernet.cpp" ".\smartcontrolvaluereceivernet.h" ".\smartcontrolvaluereceivernet.cpp" ".\serializedgraphsendernet.h" ".\serializedgraphsendernet.cpp" ".\serializedgraphreceivernet.h" ".\serializedgraphreceivernet.cpp" ". endererstatussendernet.h" ". endererstatussendernet.cpp" ". endererstatusreceivernet.h" ". endererstatusreceivernet.cpp" ". enderercontrolsendernet.h" ". enderercontrolsendernet.cpp" ". enderercontrolreceivernet.h" ". enderercontrolreceivernet.cpp" ".\modulestatisticssmartsendernet.h" ".\modulestatisticssmartsendernet.cpp" ".\modulestatisticssmartreceivernet.h" ".\modulestatisticssmartreceivernet.cpp" ".\modulestatisticssendernet.h" ".\modulestatisticssendernet.cpp" ".\modulestatisticsreceivernet.h" ".\modulestatisticsreceivernet.cpp" ".\moduledatasendernet.h" ".\moduledatasendernet.cpp" ".\moduledatareceivernet.h" ".\moduledatareceivernet.cpp"\ + ".\moduleconstructionsmartsendernet.h" ".\moduleconstructionsmartsendernet.cpp" ".\moduleconstructionsmartreceivernet.h" ".\moduleconstructionsmartreceivernet.cpp" ".\moduleconstructiondumbsendernet.h" ".\moduleconstructiondumbsendernet.cpp" ".\moduleconstructiondumbreceivernet.h" ".\moduleconstructiondumbreceivernet.cpp" ".\moduleclassspecsendernet.h" ".\moduleclassspecsendernet.cpp" ".\moduleclassspecreceivernet.h" ".\moduleclassspecreceivernet.cpp" ".\moduleclasssendernet.h" ".\moduleclasssendernet.cpp" ".\moduleclassreceivernet.h" ".\moduleclassreceivernet.cpp" ".\moduleclassnamesendernet.h" ".\moduleclassnamesendernet.cpp" ".\moduleclassnamereceivernet.h" ".\moduleclassnamereceivernet.cpp" ".\moduleclassinfosendernet.h" ".\moduleclassinfosendernet.cpp" ".\moduleclassinforeceivernet.h" ".\moduleclassinforeceivernet.cpp" ".\modelstatussendernet.h" ".\modelstatussendernet.cpp" ".\mod elstatusreceivernet.h" ".\modelstatusreceivernet.cpp" ".\modelcontrolsendernet.h" ".\modelcontrolsendernet.cpp" ".\modelcontrolreceivernet.h" ".\modelcontrolreceivernet.cpp" ".\graphnamesendernet.h" ".\graphnamesendernet.cpp" ".\graphnamereceivernet.h" ".\graphnamereceivernet.cpp"\ + ".\graphdatasendernet.h" ".\graphdatasendernet.cpp" ".\graphdatareceivernet.h" ".\graphdatareceivernet.cpp" ".rrorsendernet.h" ".rrorsendernet.cpp" ".rrorreceivernet.h" ".rrorreceivernet.cpp" ".nginecontrolsendernet.h" ".nginecontrolsendernet.cpp" ".nginecontrolreceivernet.h" ".nginecontrolreceivernet.cpp" ".