GNOME.org
 

[longomatch] Update win32 Mafefile

commit e2eac2c97b6d84ff781942c5c7ba45b844584231
Author: Andoni Morales Alastruey <ylatuya gmail com>
Date:   Fri Oct 16 22:22:03 2009 +0200

    Update win32 Mafefile

 Makefile.win32 |  229 ++++++++++++++++++++++++++++++--------------------------
 1 files changed, 123 insertions(+), 106 deletions(-)
---
diff --git a/Makefile.win32 b/Makefile.win32
index ac4eca1..1b7dc27 100644
--- a/Makefile.win32
+++ b/Makefile.win32
@@ -4,7 +4,7 @@
 MINGW_PATH = C:/MinGW/bin
 GTK = c:\Mono-2.4
 GST = c:\gstreamer
-CC   = ${MINGW_PATH}/mingw32-gcc.exe
+CC   = gcc.exe
 BASH = /bin/bash.exe
 BUNDLE = makebundle.sh
 OUTDIR = LongoMatch/Win32/bin
@@ -15,7 +15,7 @@ CSC = gmcs
 #libcesarplayer
 LINKOBJ  =   libcesarplayer/src/gstscreenshot.o libcesarplayer/src/bacon-resize.o libcesarplayer/src/video-utils.o libcesarplayer/src/bacon-video-widget-gst-0.10.o libcesarplayer/src/baconvideowidget-marshal.o libcesarplayer/src/gst-video-editor.o
 
-LIBS =  -L"${GTK}/bin" -L"${GST}/bin"  -llibgstreamer-0.10 -llibgstvideo-0.10  -llibgstaudio-0.10 -llibgstinterfaces-0.10 -llibgstpbutils-0.10 -llibgsttag-0.10 -limm32 -lshell32 -lole32 -luuid -lintl -llibcairo-2 -lpangowin32-1.0-0 -latk-1.0-0 -lgdk_pixbuf-2.0-0 -lgdk-win32-2.0-0 -lglib-2.0-0 -lgmodule-2.0-0 -lgobject-2.0-0 -lgio-2.0-0 -lgthread-2.0-0 -lgtk-win32-2.0-0  
+LIBS =  -L"LongoMatch/Win32/bin" -llibgstreamer-0.10 -llibgstvideo-0.10  -llibgstaudio-0.10 -llibgstinterfaces-0.10 -llibgstpbutils-0.10 -llibgsttag-0.10 -limm32 -lshell32 -lole32 -luuid -lintl -llibcairo-2 -lpangowin32-1.0-0 -latk-1.0-0 -lgdk_pixbuf-2.0-0 -lgdk-win32-2.0-0 -lglib-2.0-0 -lgmodule-2.0-0 -lgobject-2.0-0 -lgio-2.0-0 -lgthread-2.0-0 -lgtk-win32-2.0-0  
 
 INCS =   -I"${GST}\include\gstreamer-0.10" -I"${GTK}\include" -I"${GTK}\include\gtk-2.0" -I"${GTK}\lib\gtk-2.0\include" -I"${GTK}\include\atk-1.0" -I"${GTK}\include\pango-1.0" -I"${GTK}\include\cairo" -I"${GTK}\include\glib-2.0" -I"${GTK}\include\glib-2.0\glib" -I"${GTK}\lib\glib-2.0" -I"${GTK}\lib\glib-2.0\include" -I"${GTK}\include\libxml2" 
 
@@ -57,7 +57,6 @@ CESARPLAYER_FILES = \
 	Utils/IFramesCapturer.cs \
 	Utils/FramesCapturer.cs \
 	Utils/IMetadataReader.cs \
-	Utils/GstPlayerMetadataType.cs \
 	Utils/TimeString.cs \
 	Capturer/GccAudioEncoderType.cs \
 	Capturer/GccError.cs \
@@ -96,126 +95,144 @@ LONGOMATCH=obj/LongoMatch.exe
 CSC_LONGOMATCH_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize+ "-main:LongoMatch.MainClass"
 LONGOMATCH_COMPILE_TARGET = winexe 
 LONGOMATCH_FILES = \
-	gtk-gui/generated.cs \
 	AssemblyInfo.cs \
-	Main.cs \
-	Gui/ButtonsWidget.cs \
-	Gui/CalendarPopup.cs \
-	Gui/DBManager.cs \
-	Gui/DrawingToolBox.cs\
-	Gui/ProjectListWidget.cs \
-	Gui/FileDescriptionWidget.cs \
-	Gui/FramesCaptureProgressDialog.cs \
-	Gui/EntryDialog.cs \
-	Gui/MainWindow.cs \
-	Gui/MessagePopup.cs \
-	Gui/Migrator.cs\
-	Gui/NewProjectDialog.cs \
-	Gui/NotesWidget.cs \
-	Gui/OpenProjectDialog.cs \
-	Gui/PlayerProperties.cs \
-	Gui/PlayersListTreeWidget.cs \
-	Gui/PlayersSelectionDialog.cs \
-	Gui/PlayersTreeView.cs \
-	Gui/PlayListTreeView.cs \
-	Gui/PlayListWidget.cs \
-	Gui/SectionsPropertiesWidget.cs \
-	Gui/SnapshotsDialog.cs \
-	Gui/TeamTemplateEditor.cs \
-	Gui/TeamTemplateWidget.cs \
-	Gui/TemplatesEditor.cs \
-	Gui/TemplateEditorDialog.cs \
-	Gui/TimeAdjustWidget.cs \
-	Gui/TimeNodesTreeView.cs \
-	Gui/TreeWidget.cs \
-	Gui/TimeNodeProperties.cs \
-	Gui/TimeLineWidget.cs \
-	Gui/TimeReferenceWidget.cs \
-	Gui/TimeScale.cs \
-	Gui/TransparentDrawingArea.cs\
-	Gui/VideoEditionProperties.cs \
-	Gui/UpdateDialog.cs \
-	Gui/HotKeySelectorDialog.cs \
-	Gui/Win32CalendarDialog.cs\
-	Gui/WorkspaceChooser.cs \
+	Compat/0.0/DatabaseMigrator.cs \
+	Compat/0.0/DB/DataBase.cs \
+	Compat/0.0/DB/MediaFile.cs \
+	Compat/0.0/DB/Project.cs \
+	Compat/0.0/DB/Sections.cs \
+	Compat/0.0/IO/SectionsReader.cs \
+	Compat/0.0/Playlist/IPlayList.cs \
+	Compat/0.0/PlayListMigrator.cs \
+	Compat/0.0/Playlist/PlayList.cs \
+	Compat/0.0/TemplatesMigrator.cs \
+	Compat/0.0/Time/MediaTimeNode.cs \
+	Compat/0.0/Time/PixbufTimeNode.cs \
+	Compat/0.0/Time/PlayListTimeNode.cs \
+	Compat/0.0/Time/SectionsTimeNode.cs \
+	Compat/0.0/Time/Time.cs \
+	Compat/0.0/Time/TimeNode.cs \
+	DB/DataBase.cs \
 	DB/Project.cs \
+	DB/ProjectDescription.cs\
 	DB/Sections.cs \
-	DB/DataBase.cs \
-	Handlers/Handlers.cs \
-	IO/SectionsWriter.cs \
-	IO/SectionsReader.cs \
-	IO/XMLReader.cs \
-	Time/MediaTimeNode.cs \
-	Time/PixbufTimeNode.cs \
-	Time/SectionsTimeNode.cs \
-	Time/TimeNode.cs \
-	Time/Time.cs \
-	Time/PlayListTimeNode.cs \
-	gtk-gui/LongoMatch.Gui.Component.FileDescriptionWidget.cs \
-	gtk-gui/LongoMatch.Gui.Component.ProjectListWidget.cs \
-	gtk-gui/LongoMatch.Gui.Component.TreeWidget.cs \
-	gtk-gui/LongoMatch.Gui.Popup.CalendarPopup.cs \
-	gtk-gui/LongoMatch.Gui.Popup.TransparentDrawingArea.cs\
+	DB/Tag.cs \
+	DB/TagsTemplate.cs \
+	DB/TeamTemplate.cs \
+	gtk-gui/generated.cs \
 	gtk-gui/LongoMatch.Gui.Component.ButtonsWidget.cs \
-	gtk-gui/LongoMatch.Gui.Component.DrawingToolBox.cs\
-	gtk-gui/LongoMatch.Gui.Dialog.DBManager.cs \
-	gtk-gui/LongoMatch.Gui.Dialog.OpenProjectDialog.cs \
-	gtk-gui/LongoMatch.Gui.Dialog.NewProjectDialog.cs \
-	gtk-gui/LongoMatch.Gui.Component.TimeAdjustWidget.cs \
-	gtk-gui/LongoMatch.Gui.Component.SectionsPropertiesWidget.cs \
-	gtk-gui/LongoMatch.Gui.Component.TimeNodeProperties.cs \
-	gtk-gui/LongoMatch.Gui.Dialog.TemplateEditorDialog.cs \
+	gtk-gui/LongoMatch.Gui.Component.CategoryProperties.cs \
+	gtk-gui/LongoMatch.Gui.Component.DrawingWidget.cs \
+	gtk-gui/LongoMatch.Gui.Component.DrawingToolBox.cs \
+	gtk-gui/LongoMatch.Gui.Component.NotesWidget.cs \
+	gtk-gui/LongoMatch.Gui.Component.PlayerProperties.cs \
+	gtk-gui/LongoMatch.Gui.Component.PlayersListTreeWidget.cs \
 	gtk-gui/LongoMatch.Gui.Component.PlayListWidget.cs \
+	gtk-gui/LongoMatch.Gui.Component.PlaysListTreeWidget.cs \
+	gtk-gui/LongoMatch.Gui.Component.ProjectDetailsWidget.cs \
+	gtk-gui/LongoMatch.Gui.Component.ProjectListWidget.cs \
+	gtk-gui/LongoMatch.Gui.Component.ProjectTemplateWidget.cs \
+	gtk-gui/LongoMatch.Gui.Component.TeamTemplateWidget.cs \
+	gtk-gui/LongoMatch.Gui.Component.TimeAdjustWidget.cs \
 	gtk-gui/LongoMatch.Gui.Component.TimeLineWidget.cs \
-	gtk-gui/LongoMatch.Gui.Dialog.VideoEditionProperties.cs \
-	gtk-gui/LongoMatch.Gui.Dialog.SnapshotsDialog.cs \
-	gtk-gui/LongoMatch.Gui.Component.NotesWidget.cs \
-	gtk-gui/LongoMatch.Gui.MainWindow.cs \
+	gtk-gui/LongoMatch.Gui.Dialog.DrawingTool.cs \
+	gtk-gui/LongoMatch.Gui.Dialog.EditCategoryDialog.cs \
+	gtk-gui/LongoMatch.Gui.Dialog.EditPlayerDialog.cs \
+	gtk-gui/LongoMatch.Gui.Dialog.EntryDialog.cs \
 	gtk-gui/LongoMatch.Gui.Dialog.FramesCaptureProgressDialog.cs \
-	gtk-gui/LongoMatch.Gui.Dialog.Migrator.cs \
-	gtk-gui/LongoMatch.Gui.Dialog.UpdateDialog.cs \
 	gtk-gui/LongoMatch.Gui.Dialog.HotKeySelectorDialog.cs \
-	gtk-gui/LongoMatch.Gui.Component.PlayerProperties.cs \
-	gtk-gui/LongoMatch.Gui.Component.TeamTemplateWidget.cs \
+	gtk-gui/LongoMatch.Gui.Dialog.Migrator.cs \
+	gtk-gui/LongoMatch.Gui.Dialog.NewProjectDialog.cs \
+	gtk-gui/LongoMatch.Gui.Dialog.OpenProjectDialog.cs \
+	gtk-gui/LongoMatch.Gui.Dialog.PlayersSelectionDialog.cs \
+	gtk-gui/LongoMatch.Gui.Dialog.ProjectsManager.cs \
+	gtk-gui/LongoMatch.Gui.Dialog.ProjectTemplateEditorDialog.cs \
+	gtk-gui/LongoMatch.Gui.Dialog.SnapshotsDialog.cs \
 	gtk-gui/LongoMatch.Gui.Dialog.TeamTemplateEditor.cs \
 	gtk-gui/LongoMatch.Gui.Dialog.TemplatesManager.cs \
-	gtk-gui/LongoMatch.Gui.Component.PlayersListTreeWidget.cs \
-	gtk-gui/LongoMatch.Gui.Dialog.WorkspaceChooser.cs \
-	gtk-gui/LongoMatch.Gui.Dialog.PlayersSelectionDialog.cs \
-	gtk-gui/LongoMatch.Gui.Dialog.EntryDialog.cs \
+	gtk-gui/LongoMatch.Gui.Dialog.UpdateDialog.cs \
+	gtk-gui/LongoMatch.Gui.Dialog.VideoEditionProperties.cs \
 	gtk-gui/LongoMatch.Gui.Dialog.Win32CalendarDialog.cs \
+	gtk-gui/LongoMatch.Gui.MainWindow.cs \
+	gtk-gui/LongoMatch.Gui.Popup.CalendarPopup.cs \
+	gtk-gui/LongoMatch.Gui.Popup.TransparentDrawingArea.cs \
+	Gui/Component/ButtonsWidget.cs \
+	Gui/Component/CategoryProperties.cs \
+	Gui/Component/DrawingWidget.cs \
+	Gui/Component/DrawingToolBox.cs \
+	Gui/Component/NotesWidget.cs \
+	Gui/Component/PlayerProperties.cs \
+	Gui/Component/PlayersListTreeWidget.cs \
+	Gui/Component/PlayListWidget.cs \
+	Gui/Component/PlaysListTreeWidget.cs \
+	Gui/Component/ProjectDetailsWidget.cs \
+	Gui/Component/ProjectListWidget.cs \
+	Gui/Component/ProjectTemplateWidget.cs \
+	Gui/Component/TeamTemplateWidget.cs\
+	Gui/Component/TimeAdjustWidget.cs \
+	Gui/Component/TimeLineWidget.cs \
+	Gui/Component/TimeReferenceWidget.cs \
+	Gui/Component/TimeScale.cs \
+	Gui/Dialog/DrawingTool.cs \
+	Gui/Dialog/EditCategoryDialog.cs \
+	Gui/Dialog/EditPlayerDialog.cs \
+	Gui/Dialog/EntryDialog.cs \
+	Gui/Dialog/FramesCaptureProgressDialog.cs \
+	Gui/Dialog/HotKeySelectorDialog.cs \
+	Gui/Dialog/Migrator.cs \
+	Gui/Dialog/NewProjectDialog.cs \
+	Gui/Dialog/OpenProjectDialog.cs \
+	Gui/Dialog/PlayersSelectionDialog.cs \
+	Gui/Dialog/ProjectsManager.cs \
+	Gui/Dialog/ProjectTemplateEditorDialog.cs \
+	Gui/Dialog/SnapshotsDialog.cs \
+	Gui/Dialog/TemplatesEditor.cs \
+	Gui/Dialog/TeamTemplateEditor.cs\
+	Gui/Dialog/UpdateDialog.cs \
+	Gui/Dialog/VideoEditionProperties.cs \
+	Gui/Dialog/Win32CalendarDialog.cs \
+	Gui/MainWindow.cs \
+	Gui/Popup/CalendarPopup.cs \
+	Gui/Popup/MessagePopup.cs \
+	Gui/TransparentDrawingArea.cs \
+	Gui/TreeView/CategoriesTreeView.cs \
+	Gui/TreeView/PlayerPropertiesTreeView.cs \
+	Gui/TreeView/PlayersTreeView.cs \
+	Gui/TreeView/PlayListTreeView.cs \
+	Gui/TreeView/PlaysTreeView.cs \
+	Handlers/DrawingManager.cs \
+	Handlers/EventsManager.cs \
+	Handlers/Handlers.cs \
+	Handlers/HotKeysManager.cs \
+	Handlers/VideoDrawingsManager.cs\
+	IO/CSVExport.cs \
+	IO/SectionsReader.cs \
+	IO/SectionsWriter.cs \
+	IO/XMLReader.cs \
+	Main.cs \
 	Playlist/IPlayList.cs \
 	Playlist/PlayList.cs \
-	Updates/Updater.cs \
-	Updates/XmlUpdateParser.cs \
-	IO/CSVExport.cs \
+	Time/Drawing.cs\
 	Time/HotKey.cs \
-	Handlers/DrawingManager.cs\
-	Handlers/EventsManager.cs \
-	Handlers/HotKeysManager.cs \
-	DB/TeamTemplate.cs \
+	Time/MediaTimeNode.cs \
+	Time/PixbufTimeNode.cs \
 	Time/Player.cs \
-	Compat/0.0/DB/DataBase.cs \
-	Compat/0.0/DB/MediaFile.cs \
-	Compat/0.0/DB/Project.cs \
-	Compat/0.0/DB/Sections.cs \
-	Compat/0.0/IO/SectionsReader.cs\
-	Compat/0.0/Time/MediaTimeNode.cs \
-	Compat/0.0/Time/PixbufTimeNode.cs \
-	Compat/0.0/Time/PlayListTimeNode.cs \
-	Compat/0.0/Time/SectionsTimeNode.cs \
-	Compat/0.0/Time/Time.cs \
-	Compat/0.0/Time/TimeNode.cs \
-	Compat/0.0/Playlist/IPlayList.cs \
-	Compat/0.0/Playlist/PlayList.cs \
-	Compat/0.0/DatabaseMigrator.cs \
-	Compat/0.0/PlayListMigrator.cs\
-	Compat/0.0/TemplatesMigrator.cs 
+	Time/PlayListTimeNode.cs \
+	Time/SectionsTimeNode.cs \
+	Time/Time.cs \
+	Time/TimeNode.cs \
+	Updates/Updater.cs \
+	Updates/XmlUpdateParser.cs
 
 LONGOMATCH_RESOURCES = \
 	-resource:./gtk-gui/objects.xml \
 	-resource:./gtk-gui/gui.stetic\
-	-resource:./images/longomatch.png,longomatch.png
+	-resource:./images/longomatch.png,longomatch.png\
+	-resource:./images/stock_draw-line-45.png,stock_draw-line-45.png\
+	-resource:./images/stock_draw-circle-unfilled.png,stock_draw-circle-unfilled.png\
+	-resource:./images/stock_draw-line-ends-with-arrow.png,stock_draw-line-ends-with-arrow.png\
+	-resource:./images/stock_draw-rectangle-unfilled.png,stock_draw-rectangle-unfilled.png\
+	-resource:./images/stock_draw-freeform-line.png,stock_draw-freeform-line.png
 
 LONGOMATCH_REFERENCES = \
 	-r:Mono.Posix \
@@ -225,7 +242,7 @@ LONGOMATCH_REFERENCES = \
 	-pkg:gtk-sharp-2.0 \
 	-pkg:glib-sharp-2.0 \
 	-r:../obj/CesarPlayer.dll \
-	-r:../LongoMatch/Win32/build/Db4objects.Db4o.dll
+	-r:../LongoMatch/Win32/deps/Db4objects.Db4o.dll
 
 
 .PHONY: all all-before all-after clean clean-custom
@@ -263,5 +280,5 @@ libcesarplayer/src/baconvideowidget-marshal.o:libcesarplayer/src/baconvideowidge
 $(CESARPLAYER):
 	cd CesarPlayer && $(CSC) $(CSC_CESARPLAYER_FLAGS) -out:../$(CESARPLAYER) -target:$(CESARPLAYER_COMPILE_TARGET) $(CESARPLAYER_FILES) $(CESARPLAYER_REFERENCES) $(CESARPLAYER_RESOURCES)
 
-$(LONGOMATCH):$(CESARPLAYER)
+$(LONGOMATCH):$(CESARPLAYER) 
 	cd LongoMatch && $(CSC) $(CSC_LONGOMATCH_FLAGS) -out:../$(LONGOMATCH) -target:$(LONGOMATCH_COMPILE_TARGET) $(LONGOMATCH_FILES) $(LONGOMATCH_REFERENCES) $(LONGOMATCH_RESOURCES)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]