[longomatch] Improve win32 makefiles

[Andoni Morales Alastruey <amorales src gnome org>]

commit 4649dd32691d14eafa822e21112ac9b6365f097c
Author: Andoni Morales Alastruey <ylatuya gmail com>
Date:   Sat Oct 17 23:25:22 2009 +0200

    Improve win32 makefiles

 LongoMatch/Win32/deps/Db4objects.Db4o.dll |  Bin 0 -> 600576 bytes
 Makefile.win32                            |  109 ++++++++++++++++-------------
 makeBundle.sh                             |    8 --
 3 files changed, 59 insertions(+), 58 deletions(-)
---
diff --git a/LongoMatch/Win32/deps/Db4objects.Db4o.dll b/LongoMatch/Win32/deps/Db4objects.Db4o.dll
new file mode 100644
index 0000000..d8f5080
Binary files /dev/null and b/LongoMatch/Win32/deps/Db4objects.Db4o.dll differ
diff --git a/Makefile.win32 b/Makefile.win32
index 1b7dc27..b3a4d61 100644
--- a/Makefile.win32
+++ b/Makefile.win32
@@ -1,27 +1,30 @@
 
 
-#Set-up environment variable 
-MINGW_PATH = C:/MinGW/bin
-GTK = c:\Mono-2.4
-GST = c:\gstreamer
-CC   = gcc.exe
-BASH = /bin/bash.exe
-BUNDLE = makebundle.sh
+#Set-up environment variable 
+MINGW_PATH = C:/MinGW/bin
+MONO_INSTALL_PATH= C:/Mono-2.4
+MONO = $(MONO_INSTALL_PATH)/bin/mono.exe
+MKBUNDLE = $(MONO_INSTALL_PATH)/lib/mono/2.0/mkbundle.exe
+DB4O = LongoMatch/Win32/deps/Db4objects.Db4o.dll 
+GTK = c:\Mono-2.4
+GST = c:\gstreamer
+CC   = gcc.exe
+BASH = /bin/bash.exe
 OUTDIR = LongoMatch/Win32/bin
 RM = rm -f
-CSC = gmcs
+CSC = $(MONO_INSTALL_PATH)/bin/gmcs
 
 
-#libcesarplayer
+#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"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" 
-
+
 BIN  = obj/libcesarplayer.dll
-
-CFLAGS = $(INCS) -DWIN32 -mms-bitfields -shared   -Wall 
+
+CFLAGS = $(INCS) -DWIN32 -mms-bitfields -shared   -Wall 
 LDFLAGS =  -shared -Wl -mno-cygwin -mms-bitfields  --export-all-symbols --enable-auto-import
 
 
@@ -91,7 +94,9 @@ CESARPLAYER_REFERENCES = \
 	-pkg:glib-sharp-2.0 \
 	
 #LongoMatch.exe
-LONGOMATCH=obj/LongoMatch.exe
+LONGOMATCH_PRE=obj/LongoMatch.exe
+LONGOMATCH_BUNDLED=obj/LongoMatchBundled.exe
+LONGOMATCH=$(OUTDIR)/LongoMatch.exe
 CSC_LONGOMATCH_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize+ "-main:LongoMatch.MainClass"
 LONGOMATCH_COMPILE_TARGET = winexe 
 LONGOMATCH_FILES = \
@@ -243,42 +248,46 @@ LONGOMATCH_REFERENCES = \
 	-pkg:glib-sharp-2.0 \
 	-r:../obj/CesarPlayer.dll \
 	-r:../LongoMatch/Win32/deps/Db4objects.Db4o.dll
-
-
-.PHONY: all all-before all-after clean clean-custom
-
-all: all-before ${BIN} bundle  all-after
-
-install: $(BIN)
-	cp $(BIN) "$(OUTDIR)"
-	cp obj/LongoMatch.exe "$(OUTDIR)"
-
-clean: clean-custom
-	${RM} $(OBJ) $(BIN) obj/*
-
-bundle:$(BUNDLE) $(LONGOMATCH)
-	${BASH} $(BUNDLE)     
-
-$(BIN): $(LINKOBJ)	
-	$(CC) $(LDFLAGS) -o $(BIN) $(LINKOBJ) $(LIBS)
-
-libcesarplayer/src/bacon-resize.o:libcesarplayer/src/bacon-resize.c
-	$(CC) -c libcesarplayer/src/bacon-resize.c -o  libcesarplayer/src/bacon-resize.o $(CFLAGS)
-
-libcesarplayer/src/video-utils.o:libcesarplayer/src/video-utils.c
-	$(CC) -c libcesarplayer/src/video-utils.c -o libcesarplayer/src/video-utils.o $(CFLAGS)
-
-libcesarplayer/src/gst-video-editor.o:libcesarplayer/src/gst-video-editor.c
-	$(CC) -c libcesarplayer/src/gst-video-editor.c -o  libcesarplayer/src/gst-video-editor.o $(CFLAGS)
-
-libcesarplayer/src/bacon-video-widget-gst-0.10.o:libcesarplayer/src/bacon-video-widget-gst-0.10.c
-	$(CC) -c libcesarplayer/src/bacon-video-widget-gst-0.10.c -o libcesarplayer/src/bacon-video-widget-gst-0.10.o $(CFLAGS)
-
-libcesarplayer/src/baconvideowidget-marshal.o:libcesarplayer/src/baconvideowidget-marshal.c
+
+
+.PHONY: all all-before all-after clean clean-custom
+
+all: all-before ${BIN} bundle  all-after
+
+install: $(BIN)
+	cp $(BIN) "$(OUTDIR)"
+	cp $(LONGOMATCH) "$(OUTDIR)\LongoMatch.exe"
+
+clean: clean-custom
+	${RM} $(OBJ) $(BIN) obj/*
+
+bundle:$(LONGOMATCH_PRE)
+	windres LongoMatch/images/minilogo.rc obj/minilogo.o
+	cp $(DB4O) obj/.
+	export MONO_PATH=obj/ && $(MONO) $(MKBUNDLE) $(LONGOMATCH_PRE) --deps -c -o obj/temp.c -oo obj/temp.o
+	export PKG_CONFIG_PATH=$(MONO_INSTALL_PATH)/lib/pkgconfig/ && $(CC) -mno-cygwin -g -o $(LONGOMATCH_BUNDLED) -Wall obj/temp.c `pkg-config --cflags --libs mono|dos2unix`  obj/minilogo.o obj/temp.o 
+     
+
+$(BIN): $(LINKOBJ)	
+	$(CC) $(LDFLAGS) -o $(BIN) $(LINKOBJ) $(LIBS)
+
+libcesarplayer/src/bacon-resize.o:libcesarplayer/src/bacon-resize.c
+	$(CC) -c libcesarplayer/src/bacon-resize.c -o  libcesarplayer/src/bacon-resize.o $(CFLAGS)
+
+libcesarplayer/src/video-utils.o:libcesarplayer/src/video-utils.c
+	$(CC) -c libcesarplayer/src/video-utils.c -o libcesarplayer/src/video-utils.o $(CFLAGS)
+
+libcesarplayer/src/gst-video-editor.o:libcesarplayer/src/gst-video-editor.c
+	$(CC) -c libcesarplayer/src/gst-video-editor.c -o  libcesarplayer/src/gst-video-editor.o $(CFLAGS)
+
+libcesarplayer/src/bacon-video-widget-gst-0.10.o:libcesarplayer/src/bacon-video-widget-gst-0.10.c
+	$(CC) -c libcesarplayer/src/bacon-video-widget-gst-0.10.c -o libcesarplayer/src/bacon-video-widget-gst-0.10.o $(CFLAGS)
+
+libcesarplayer/src/baconvideowidget-marshal.o:libcesarplayer/src/baconvideowidget-marshal.c
 	$(CC) -c libcesarplayer/src/baconvideowidget-marshal.c -o libcesarplayer/src/baconvideowidget-marshal.o $(CFLAGS)
 
 $(CESARPLAYER):
-	cd CesarPlayer && $(CSC) $(CSC_CESARPLAYER_FLAGS) -out:../$(CESARPLAYER) -target:$(CESARPLAYER_COMPILE_TARGET) $(CESARPLAYER_FILES) $(CESARPLAYER_REFERENCES) $(CESARPLAYER_RESOURCES)
+	cd CesarPlayer && $(CSC) $(CSC_CESARPLAYER_FLAGS) -out:../$(CESARPLAYER) -target:$(CESARPLAYER_COMPILE_TARGET) $(CESARPLAYER_FILES) $(CESARPLAYER_REFERENCES) $(CESARPLAYER_RESOURCES)
 
-$(LONGOMATCH):$(CESARPLAYER) 
-	cd LongoMatch && $(CSC) $(CSC_LONGOMATCH_FLAGS) -out:../$(LONGOMATCH) -target:$(LONGOMATCH_COMPILE_TARGET) $(LONGOMATCH_FILES) $(LONGOMATCH_REFERENCES) $(LONGOMATCH_RESOURCES)
+$(LONGOMATCH_PRE):$(CESARPLAYER) 
+	cd LongoMatch && $(CSC) $(CSC_LONGOMATCH_FLAGS) -out:../$(LONGOMATCH_PRE) -target:$(LONGOMATCH_COMPILE_TARGET) $(LONGOMATCH_FILES) $(LONGOMATCH_REFERENCES) $(LONGOMATCH_RESOURCES)