コミット: 87378ca7c3a3340707be2b3923cf0d914218d160 - dia (git)

作図ソフト dia の改良版

コミットメタ情報

• リビジョン: 87378ca7c3a3340707be2b3923cf0d914218d160 (tree)
• 日時: 2006-02-12 18:08:54
• 作者: Hans Breuer <hans@breu...>
• コミッター: Hans Breuer

ログメッセージ

build three components dia.exe (console application), diaw.exe (windows

2006-02-12 Hans Breuer <[e-mail]>

* app/makefile.msc : build three components dia.exe (console
application), diaw.exe (windows application) and dia-app.dll
containing almost all of Dia's application shared between
the two executables
* app/main.c app/winmain.c app/app_procs.c app/dia.def : some
refactoring to accomplish the new dependency layout
* objects/makefile.msc plug-ins/python/makefile.msc : need to
link dia-app.lib now - if at all depending on app/*

変更サマリ

• modified: ChangeLog
• modified: app/app_procs.c
• modified: app/dia.def
• modified: app/main.c
• modified: app/makefile.msc
• modified: app/winmain.c
• modified: objects/makefile.msc
• modified: plug-ins/python/makefile.msc

差分

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
[phone]  Hans Breuer  <[e-mail]>
+
+	* app/makefile.msc : build three components dia.exe (console
+	application), diaw.exe (windows application) and dia-app.dll
+	containing almost all of Dia's application shared between
+	the two executables
+	* app/main.c app/winmain.c app/app_procs.c app/dia.def : some 
+	refactoring to accomplish the new dependency layout
+	* objects/makefile.msc plug-ins/python/makefile.msc : need to
+	link dia-app.lib now - if at all depending on app/*
+	
 2006-02-11  Hans Breuer  <[e-mail]>
 
 	* makefile.msc : nmake -f makefile.msc just compiles now

--- a/app/app_procs.c
+++ b/app/app_procs.c
@@ -835,11 +835,6 @@ app_init (int argc, char **argv)
 
   if (!dia_is_interactive)
     log_to_stderr = TRUE;
-  else {
-#ifdef G_OS_WIN32
-    dia_redirect_console ();
-#endif
-  }
   
   if (log_to_stderr)
     set_message_func(stderr_message_internal);
@@ -1308,3 +1303,8 @@ parse_size(gchar *size, long *width, long *height)
     *height = 0;
   }
 }
+
+int app_is_embedded(void)
+{
+  return 0;
+}

--- a/app/dia.def
+++ b/app/dia.def
@@ -36,3 +36,11 @@ EXPORTS
  diagram_update_extents
  diagram_update_connections_object
  dia_open_diagrams
+
+ ; just for the applications
+ app_is_embedded
+ app_init
+ app_is_interactive
+ app_splash_done
+ toolbox_show
+

--- a/app/main.c
+++ b/app/main.c
@@ -26,11 +26,6 @@
 #include "load_save.h"
 #include "interface.h"
 
-int app_is_embedded(void)
-{
-  return 0;
-}
-
 int main(int argc, char *argv[])
 {
   app_init(argc, argv);

--- a/app/makefile.msc
+++ b/app/makefile.msc
@@ -61,7 +61,6 @@ OBJECTS = \
 	linewidth_area.obj \
 	load_save.obj \
 	magnify.obj \
-	main.obj \
 	menus.obj \
 	modify_tool.obj \
 	navigation.obj \
@@ -85,8 +84,7 @@ OBJECTS = \
 	textedit.obj \
 	tool.obj \
 	undo.obj \
-	win32print.obj \
-	winmain.obj
+	win32print.obj
 
 ICON_PNG_PAIRS = \
 	dia_connectable_icon pixmaps\connectable.png \
@@ -117,9 +115,8 @@ dia-app-icons.h : makefile.msc pixmaps\*.png
 CC = cl -G5 -GF $(OPTIMIZE) $(CRUNTIME) -W3 -nologo
 
 # No general LDFLAGS needed
-# Use /subsystem:console to enable console output
-#LDFLAGS = /link $(LINKDEBUG) /subsystem:console /machine:ix86
-LDFLAGS = /link $(LINKDEBUG) /subsystem:windows /machine:ix86
+# /subsystem:console and /subsystem:windows have their own exe
+LDFLAGS = /link $(LINKDEBUG) /machine:ix86
 INSTALL = copy
 
 CFLAGS = -I. -I$(PRJ_TOP) -DHAVE_CONFIG_H
@@ -128,7 +125,9 @@ CFLAGS = -I. -I$(PRJ_TOP) -DHAVE_CONFIG_H
 all : \
 	$(PRJ_TOP)\config.h \
 	dia-app-icons.h \
-	$(PACKAGE).exe
+	$(PACKAGE)-app.dll \
+	$(PACKAGE).exe \
+	$(PACKAGE)w.exe
 
 $(PACKAGE).res : $(PACKAGE).rc $(PACKAGE).ico
 	rc -r -fo $(PACKAGE).res $(PACKAGE).rc
@@ -138,13 +137,18 @@ RESOURCE = $(PACKAGE).res
 $(PACKAGE).lib : $(OBJECTS)
 	lib /out:$(PACKAGE).lib $(OBJECTS)
 
-$(PACKAGE).dll : $(OBJECTS) $(PACKAGE).def
-	$(CC) $(CFLAGS) -LD -Fe$(PACKAGE).dll $(OBJECTS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:$(PACKAGE).def
-
-$(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res
-	$(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res $(OBJECTS) $(PKG_LINK) \
+$(PACKAGE)-app.dll : $(OBJECTS) $(PACKAGE).def
+	$(CC) $(CFLAGS) -LD -Fe$(PACKAGE)-app.dll $(OBJECTS) $(PKG_LINK) \
 	gdi32.lib comdlg32.lib user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def
 
+$(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res main.obj $(PACKAGE)-app.dll
+	$(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res main.obj dia-app.lib $(PKG_LINK) \
+	user32.lib advapi32.lib $(LDFLAGS) /subsystem:console
+
+$(PACKAGE)w.exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res winmain.obj $(PACKAGE)-app.dll
+	$(CC) $(CFLAGS) -Fe$(PACKAGE)w.exe $(PACKAGE).res winmain.obj dia-app.lib $(PKG_LINK) \
+	gdi32.lib comdlg32.lib user32.lib advapi32.lib $(LDFLAGS) /subsystem:windows
+
 $(PRJ_TOP)/config.h: $(PRJ_TOP)/config.h.win32
 	copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h
 

--- a/app/winmain.c
+++ b/app/winmain.c
@@ -5,10 +5,13 @@
 #include <gtk/gtk.h> /* just for version */
 
 #ifdef G_OS_WIN32
+#define Rectangle Win32Rectangle 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h> /* native file api */
+#undef Rectangle
 
-extern int main (int argc, char **argv);
+#include "app_procs.h"
+#include "interface.h"
 
 /* In case we build this as a windowed application */
 
@@ -24,7 +27,20 @@ WinMain (struct HINSTANCE__ *hInstance,
 	 char               *lpszCmdLine,
 	 int                 nCmdShow)
 {
-  return main (__argc, __argv);
+  dia_redirect_console ();
+  
+  app_init (__argc, __argv);
+
+  if (!app_is_interactive())
+    return 0;
+
+  toolbox_show();
+
+  app_splash_done();
+  
+  gtk_main ();
+
+  return 0;
 }
 
 void

--- a/objects/makefile.msc
+++ b/objects/makefile.msc
@@ -253,7 +253,7 @@ OBJECTS = \
         arch_state.obj \
         mapping.obj
 # this plug-in imports diagram_load_and_display () from dia.exe 
-PKG_LINK = $(PKG_LINK) ..\..\app\dia.lib
+PKG_LINK = $(PKG_LINK) ..\..\app\dia-app.lib
 !ENDIF
 
 !IFDEF OBJ_sybase

--- a/plug-ins/python/makefile.msc
+++ b/plug-ins/python/makefile.msc
@@ -32,7 +32,7 @@ CFLAGS = -FImsvc_recommended_pragmas.h \
 	$(LIBXML2_CFLAGS)
 
 EXTRALIBS = $(EXTRALIBS) $(LIBXML2_LIBS) $(INTL_LIBS) $(PANGO_LIBS) \
-	..\..\lib\libdia.lib ..\..\app\dia.lib
+	..\..\lib\libdia.lib ..\..\app\dia-app.lib
 
 OBJECTS = \
 	diamodule.obj \