[gtkmm/master.msvc] Build: Build gdkmm into gtkmm

From: Chun-wei Fan <fanchunwei src gnome org>
To: commits-list gnome org
Cc:
Subject: [gtkmm/master.msvc] Build: Build gdkmm into gtkmm
Date: Mon, 17 Jun 2019 11:02:13 +0000 (UTC)
commit 32768bf0771e8121b279076a236e15048464ce63
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Mon Jun 17 18:58:34 2019 +0800

    Build: Build gdkmm into gtkmm
    
    In the autotools builds, GDKMM is no longer built as a standalone DLL
    but is instead part of the GTKMM DLL.  Make it the case in the Visual
    Studio builds as well.  This makes things in line with what happens in
    GTK master.
    
    Also remove all traces of gdkmm.rc, since that is no longer used.

 .gitignore                       |  1 -
 MSVC_NMake/build-rules-msvc.mak  | 21 +++---------
 MSVC_NMake/create-lists-msvc.mak |  3 --
 MSVC_NMake/filelist.am           |  1 -
 MSVC_NMake/gdkmm/gdkmm.rc.in     | 71 ----------------------------------------
 MSVC_NMake/generate-msvc.mak     |  7 ++--
 MSVC_NMake/install.mak           | 14 +++-----
 configure.ac                     |  1 -
 8 files changed, 12 insertions(+), 107 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c387590a..205d3094 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,7 +25,6 @@ stamp-h?
 /libtool
 
 # MSVC
-MSVC_NMake/gdkmm/gdkmm.rc
 MSVC_NMake/gdkmm/gdkmmconfig.h
 MSVC_NMake/gtkmm/gtkmm.rc
 MSVC_NMake/gtkmm/gtkmmconfig.h
diff --git a/MSVC_NMake/build-rules-msvc.mak b/MSVC_NMake/build-rules-msvc.mak
index f43afcee..3eb93e02 100644
--- a/MSVC_NMake/build-rules-msvc.mak
+++ b/MSVC_NMake/build-rules-msvc.mak
@@ -18,9 +18,6 @@
 $<
 <<
 
-{.\gdkmm\}.rc{$(CFG)\$(PLAT)\gdkmm\}.res:
-       rc /fo$@ $<
-
 {..\gtk\gtkmm\}.cc{$(CFG)\$(PLAT)\gtkmm\}.obj::
        $(CXX) $(LIBGTKMM_CFLAGS) $(CFLAGS_NOGL) /Fo$(CFG)\$(PLAT)\gtkmm\ /c @<<
 $<
@@ -40,7 +37,6 @@ $<
 <<
 
 # Rules for building .lib files
-$(GDKMM_LIB): $(GDKMM_DLL)
 $(GTKMM_LIB): $(GTKMM_DLL)
 
 # Rules for linking DLLs
@@ -50,15 +46,10 @@ $(GTKMM_LIB): $(GTKMM_DLL)
 # $(dependent_objects)
 # <<
 #      @-if exist $@.manifest mt /manifest $@.manifest /outputresource:$@;2
-$(GDKMM_DLL): $(CFG)\$(PLAT)\gdkmm\gdkmm.def $(gdkmm_OBJS)
-       link /DLL $(LDFLAGS_NOLTCG) $(GDKMM_DEP_LIBS) /implib:$(GDKMM_LIB) 
/def:$(CFG)\$(PLAT)\gdkmm\gdkmm.def -out:$@ @<<
-$(gdkmm_OBJS)
-<<
-       @-if exist $@.manifest mt /manifest $@.manifest /outputresource:$@;2
 
-$(GTKMM_DLL): $(GDKMM_LIB) $(CFG)\$(PLAT)\gtkmm\gtkmm.def $(gtkmm_OBJS)
-       link /DLL $(LDFLAGS_NOLTCG) $(GDKMM_LIB) $(GTKMM_DEP_LIBS) /implib:$(GTKMM_LIB) 
/def:$(CFG)\$(PLAT)\gtkmm\gtkmm.def -out:$@ @<<
-$(gtkmm_OBJS)
+$(GTKMM_DLL): $(CFG)\$(PLAT)\gtkmm\gtkmm.def $(gtkmm_OBJS) $(gdkmm_OBJS)
+       link /DLL $(LDFLAGS_NOLTCG) $(GTKMM_DEP_LIBS) /implib:$(GTKMM_LIB) 
/def:$(CFG)\$(PLAT)\gtkmm\gtkmm.def -out:$@ @<<
+$(gtkmm_OBJS) $(gdkmm_OBJS)
 <<
        @-if exist $@.manifest mt /manifest $@.manifest /outputresource:$@;2
 
@@ -77,7 +68,7 @@ $(gtkmm_OBJS)
        @-if exist $@.manifest mt /manifest $@.manifest /outputresource:$@;1
 
 $(GTKMM4_DEMO): $(GTKMM_LIB) $(CFG)\$(PLAT)\gtkmm4-demo $(gtkmm_demo_OBJS)
-       link $(LDFLAGS) $(GTKMM_LIB) $(GDKMM_LIB) $(GTKMM_DEMO_DEP_LIBS) -out:$@ @<<
+       link $(LDFLAGS) $(GTKMM_LIB) $(GTKMM_DEMO_DEP_LIBS) -out:$@ @<<
 $(gtkmm_demo_OBJS)
 <<
        @-if exist $@.manifest mt /manifest $@.manifest /outputresource:$@;1
@@ -114,7 +105,7 @@ $(CFG)\$(PLAT)\gtkmm4-test-wrap_existing.exe:
        @if not exist $(GTKMM_LIB) $(MAKE) /f Makefile.vc $(SAVED_OPTIONS) $(GTKMM_LIB)
        @if not exist $(CFG)\$(PLAT)\$(@B) $(MAKE) /f Makefile.vc $(SAVED_OPTIONS) $(CFG)\$(PLAT)\$(@B)
        $(CXX) $(GTKMM_DEMO_CFLAGS) $(CFLAGS) /Fo$(CFG)\$(PLAT)\$(@B)\ $**      \
-       /link  $(LDFLAGS) $(GTKMM_LIB) $(GDKMM_LIB) $(GTKMM_DEMO_DEP_LIBS) -out:$@
+       /link  $(LDFLAGS) $(GTKMM_LIB) $(GTKMM_DEMO_DEP_LIBS) -out:$@
        @-if exist $@.manifest mt /manifest $@.manifest /outputresource:$@;1
 
 clean:
@@ -130,8 +121,6 @@ clean:
        @-del /f /q $(CFG)\$(PLAT)\gtkmm\*.def
        @-del /f /q $(CFG)\$(PLAT)\gtkmm\*.res
        @-del /f /q $(CFG)\$(PLAT)\gtkmm\*.obj
-       @-del /f /q $(CFG)\$(PLAT)\gdkmm\*.def
-       @-del /f /q $(CFG)\$(PLAT)\gdkmm\*.res
        @-del /f /q $(CFG)\$(PLAT)\gdkmm\*.obj
        @-del /f /q $(CFG)\$(PLAT)\gendef\*.obj
        @-for /f %d in ('dir /ad /b $(CFG)\$(PLAT)\gtkmm4-test-*') do @rd $(CFG)\$(PLAT)\%d
diff --git a/MSVC_NMake/create-lists-msvc.mak b/MSVC_NMake/create-lists-msvc.mak
index c550c3fe..03ba069e 100644
--- a/MSVC_NMake/create-lists-msvc.mak
+++ b/MSVC_NMake/create-lists-msvc.mak
@@ -46,9 +46,6 @@ gdkmm_generated_private_headers = $(files_hg:.hg=_p.h)
 !if [for %c in ($(gdkmm_files_extra_cc)) do @if "%~xc" == ".cc" @call create-lists.bat file gtkmm.mak 
^$(CFG)\^$(PLAT)\gdkmm\%~nc.obj]
 !endif
 
-!if [@call create-lists.bat file gtkmm.mak ^$(CFG)\^$(PLAT)\gdkmm\gdkmm.res]
-!endif
-
 !if [call create-lists.bat footer gtkmm.mak]
 !endif
 
diff --git a/MSVC_NMake/filelist.am b/MSVC_NMake/filelist.am
index 0055ad2c..facefefc 100644
--- a/MSVC_NMake/filelist.am
+++ b/MSVC_NMake/filelist.am
@@ -10,7 +10,6 @@ msvc_nmake_data =             \
        filelist.am             \
        generate-msvc.mak       \
        gendef/gendef.cc        \
-       gdkmm/gdkmm.rc          \
        gdkmm/gdkmmconfig.h     \
        gtkmm/gtkmm.rc          \
        gtkmm/gtkmmconfig.h     \
diff --git a/MSVC_NMake/generate-msvc.mak b/MSVC_NMake/generate-msvc.mak
index e84e3d1f..7e8bd6cd 100644
--- a/MSVC_NMake/generate-msvc.mak
+++ b/MSVC_NMake/generate-msvc.mak
@@ -25,11 +25,8 @@ $(CFG)\$(PLAT)\gtkmm4-test-wrap_existing:
        @-mkdir $@
 
 # Generate .def files
-$(CFG)\$(PLAT)\gdkmm\gdkmm.def: $(GENDEF) $(CFG)\$(PLAT)\gdkmm $(gdkmm_OBJS)
-       $(CFG)\$(PLAT)\gendef.exe $@ $(GDKMM_LIBNAME) $(CFG)\$(PLAT)\gdkmm\*.obj
-
-$(CFG)\$(PLAT)\gtkmm\gtkmm.def: $(GENDEF) $(CFG)\$(PLAT)\gtkmm $(gtkmm_OBJS)
-       $(CFG)\$(PLAT)\gendef.exe $@ $(GTKMM_LIBNAME) $(CFG)\$(PLAT)\gtkmm\*.obj
+$(CFG)\$(PLAT)\gtkmm\gtkmm.def: $(GENDEF) $(CFG)\$(PLAT)\gdkmm $(CFG)\$(PLAT)\gtkmm $(gdkmm_OBJS) 
$(gtkmm_OBJS)
+       $(CFG)\$(PLAT)\gendef.exe $@ $(GTKMM_LIBNAME) $(CFG)\$(PLAT)\gdkmm\*.obj $(CFG)\$(PLAT)\gtkmm\*.obj
 
 # Generate demo GResource source file
 $(CFG)\$(PLAT)\gtkmm4-demo\demo_resources.c:   \
diff --git a/MSVC_NMake/install.mak b/MSVC_NMake/install.mak
index 7d596204..c446abb8 100644
--- a/MSVC_NMake/install.mak
+++ b/MSVC_NMake/install.mak
@@ -3,22 +3,18 @@
 
 install: all
        @if not exist $(PREFIX)\bin\ mkdir $(PREFIX)\bin
-       @if not exist $(PREFIX)\lib\gdkmm-$(GTKMM_MAJOR_VERSION).$(GTKMM_MINOR_VERSION)\include\ mkdir 
$(PREFIX)\lib\gdkmm-$(GTKMM_MAJOR_VERSION).$(GTKMM_MINOR_VERSION)\include
-       @if not exist $(PREFIX)\include\gdkmm-$(GTKMM_MAJOR_VERSION).$(GTKMM_MINOR_VERSION)\gdkmm\private\ 
@mkdir $(PREFIX)\include\gdkmm-$(GTKMM_MAJOR_VERSION).$(GTKMM_MINOR_VERSION)\gdkmm\private
        @if not exist $(PREFIX)\lib\gtkmm-$(GTKMM_MAJOR_VERSION).$(GTKMM_MINOR_VERSION)\include\ mkdir 
$(PREFIX)\lib\gtkmm-$(GTKMM_MAJOR_VERSION).$(GTKMM_MINOR_VERSION)\include
+       @if not exist $(PREFIX)\include\gtkmm-$(GTKMM_MAJOR_VERSION).$(GTKMM_MINOR_VERSION)\gdkmm\private\ 
@mkdir $(PREFIX)\include\gtkmm-$(GTKMM_MAJOR_VERSION).$(GTKMM_MINOR_VERSION)\gdkmm\private
        @if not exist $(PREFIX)\include\gtkmm-$(GTKMM_MAJOR_VERSION).$(GTKMM_MINOR_VERSION)\gtkmm\private\ 
@mkdir $(PREFIX)\include\gtkmm-$(GTKMM_MAJOR_VERSION).$(GTKMM_MINOR_VERSION)\gtkmm\private
        @copy /b $(CFG)\$(PLAT)\gtkmm4-demo.exe $(PREFIX)\bin
        @copy /b $(CFG)\$(PLAT)\gtkmm4-demo.pdb $(PREFIX)\bin
-       @copy /b $(CFG)\$(PLAT)\$(GDKMM_LIBNAME).dll $(PREFIX)\bin
        @copy /b $(CFG)\$(PLAT)\$(GTKMM_LIBNAME).dll $(PREFIX)\bin
-       @copy /b $(CFG)\$(PLAT)\$(GDKMM_LIBNAME).pdb $(PREFIX)\bin
        @copy /b $(CFG)\$(PLAT)\$(GTKMM_LIBNAME).pdb $(PREFIX)\bin
-       @copy /b $(CFG)\$(PLAT)\$(GDKMM_LIBNAME).lib $(PREFIX)\lib
        @copy /b $(CFG)\$(PLAT)\$(GTKMM_LIBNAME).lib $(PREFIX)\lib
-       @copy ..\gdk\gdkmm.h "$(PREFIX)\include\gdkmm-$(GTKMM_MAJOR_VERSION).$(GTKMM_MINOR_VERSION)\"
-       @for %h in ($(GDKMM_INT_GENERATED_HEADERS) $(gdkmm_files_extra_h)) do @copy ..\gdk\gdkmm\%h 
"$(PREFIX)\include\gdkmm-$(GTKMM_MAJOR_VERSION).$(GTKMM_MINOR_VERSION)\gdkmm\%h"
-       @for %h in ($(GDKMM_INT_GENERATED_HEADERS_P)) do @copy ..\gdk\gdkmm\private\%h 
"$(PREFIX)\include\gdkmm-$(GTKMM_MAJOR_VERSION).$(GTKMM_MINOR_VERSION)\gdkmm\private\%h"
-       @copy ".\gdkmm\gdkmmconfig.h" 
"$(PREFIX)\lib\gdkmm-$(GTKMM_MAJOR_VERSION).$(GTKMM_MINOR_VERSION)\include\"
+       @copy ..\gdk\gdkmm.h "$(PREFIX)\include\gtkmm-$(GTKMM_MAJOR_VERSION).$(GTKMM_MINOR_VERSION)\"
+       @for %h in ($(GDKMM_INT_GENERATED_HEADERS) $(gdkmm_files_extra_h)) do @copy ..\gdk\gdkmm\%h 
"$(PREFIX)\include\gtkmm-$(GTKMM_MAJOR_VERSION).$(GTKMM_MINOR_VERSION)\gdkmm\%h"
+       @for %h in ($(GDKMM_INT_GENERATED_HEADERS_P)) do @copy ..\gdk\gdkmm\private\%h 
"$(PREFIX)\include\gtkmm-$(GTKMM_MAJOR_VERSION).$(GTKMM_MINOR_VERSION)\gdkmm\private\%h"
+       @copy ".\gdkmm\gdkmmconfig.h" 
"$(PREFIX)\lib\gtkmm-$(GTKMM_MAJOR_VERSION).$(GTKMM_MINOR_VERSION)\include\"
        @copy ..\gtk\gtkmm.h "$(PREFIX)\include\gtkmm-$(GTKMM_MAJOR_VERSION).$(GTKMM_MINOR_VERSION)\"
        @for %h in ($(GTKMM_INT_GENERATED_HEADERS)) do @copy ..\gtk\gtkmm\%h 
"$(PREFIX)\include\gtkmm-$(GTKMM_MAJOR_VERSION).$(GTKMM_MINOR_VERSION)\gtkmm\%h"
        @for %h in ($(gtkmm_files_extra_any_h) $(gtkmm_files_extra_deprecated_h)) do @copy ..\gtk\gtkmm\%h 
"$(PREFIX)\include\gtkmm-$(GTKMM_MAJOR_VERSION).$(GTKMM_MINOR_VERSION)\gtkmm\%h"
diff --git a/configure.ac b/configure.ac
index 19d731ba..30b8df3e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -159,7 +159,6 @@ AC_CONFIG_FILES([Makefile
                  demos/Makefile
                  docs/Makefile
                  docs/reference/Doxyfile
-                 MSVC_NMake/gdkmm/gdkmm.rc
                  MSVC_NMake/gtkmm/gtkmm.rc
                  win32_installer/gtkmm-installer.nsi])
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]