Merge branch 'master' into master-merge

diff --git a/README.md b/README.md
index 3b5fd112a7cf903925b9fcf3222f0eb61c27d4ba..3395423387885c24a3fc3d820a0fbc0112151d41 100644 (file)
--- a/README.md
+++ b/README.md
@@ -100,7 +100,7 @@ If you plan to build a bundle, you also need to install `patchelf`
 Note: some dependencies of gtk+ seems to only be pulled with gtk+3, gtkglext seems to require libffi.
 
 ```sh
-brew install cmake glib libffi gtk+ gtk+3 pkgconfig minizip webp coreutils gnu-sed wget sassc
+brew install cmake glib gobject-introspection libffi gtk+ gtk+3 gtk-doc pkgconfig minizip webp coreutils gnu-sed wget sassc
 brew link --force gettext
 ```
 

diff --git a/cmake/FindGLIB.cmake b/cmake/FindGLIB.cmake
index cf12399e3f95c8d24043058a1bff32eb92e6e229..e1e09e35575e5f55920d5224320a4d2e68cb57c6 100644 (file)
--- a/cmake/FindGLIB.cmake
+++ b/cmake/FindGLIB.cmake
@@ -9,6 +9,9 @@ if (PKG_CONFIG_FOUND)
         set(_pkgconfig_REQUIRED REQUIRED)
     endif ()
     pkg_check_modules(GLIB ${_pkgconfig_REQUIRED} glib-2.0)
+    if (GLIB_LINK_LIBRARIES)
+        set(GLIB_LIBRARIES ${GLIB_LINK_LIBRARIES}) # HACK
+    endif ()
 else ()
     find_path(GLIB_INCLUDE_DIRS glib.h)
     find_library(GLIB_LIBRARIES glib-2.0)

diff --git a/cmake/FindGTK2.cmake b/cmake/FindGTK2.cmake
index ff205261d74b2301d43497622e9f9671f622f03c..6f21791d3eeaac20776b75ce8988880c2bf833af 100644 (file)
--- a/cmake/FindGTK2.cmake
+++ b/cmake/FindGTK2.cmake
@@ -4,6 +4,9 @@ if (PKG_CONFIG_FOUND)
         set(_pkgconfig_REQUIRED REQUIRED)
     endif ()
     pkg_check_modules(GTK2 ${_pkgconfig_REQUIRED} gtk+-2.0)
+    if (GTK2_LINK_LIBRARIES)
+        set(GTK2_LIBRARIES ${GTK2_LINK_LIBRARIES}) # HACK
+    endif ()
 else ()
     find_path(GTK2_INCLUDE_DIRS gtk.h)
     # find_library(GTK2_LIBRARIES)

diff --git a/cmake/FindGtkGLExt.cmake b/cmake/FindGtkGLExt.cmake
index fa8ddda9af38d324e0789a37bc6faf7d0c2c8441..7090890bdfaf54baa109ef9ace6163519c03d313 100644 (file)
--- a/cmake/FindGtkGLExt.cmake
+++ b/cmake/FindGtkGLExt.cmake
@@ -11,6 +11,9 @@ if (PKG_CONFIG_FOUND)
     elseif (WIN32)
         pkg_check_modules(GtkGLExt ${_pkgconfig_REQUIRED} gtkglext-win32-1.0)
     endif ()
+    if (GtkGLExt_LINK_LIBRARIES)
+        set(GtkGLExt_LIBRARIES ${GtkGLExt_LINK_LIBRARIES}) # HACK
+    endif ()
 else ()
     find_path(GtkGLExt_INCLUDE_DIRS gtkglwidget.h)
     # find_library(GtkGLExt_LIBRARIES)

diff --git a/cmake/FindMinizip.cmake b/cmake/FindMinizip.cmake
index 0de098f438fb258aba1d66bf397cb802e660db09..8aeea29614c10c4dfadcc90e98ca7de9c186a67f 100644 (file)
--- a/cmake/FindMinizip.cmake
+++ b/cmake/FindMinizip.cmake
@@ -4,6 +4,9 @@ if (PKG_CONFIG_FOUND)
         set(_pkgconfig_REQUIRED REQUIRED)
     endif ()
     pkg_check_modules(Minizip ${_pkgconfig_REQUIRED} minizip)
+    if (Minizip_LINK_LIBRARIES)
+        set(Minizip_LIBRARIES ${Minizip_LINK_LIBRARIES}) # HACK
+    endif ()
 else ()
     find_path(Minizip_INCLUDE_DIRS unzip.h)
     # find_library(Minizip_LIBRARIES)

diff --git a/cmake/FindPango.cmake b/cmake/FindPango.cmake
index 67359ef05887d013654475160f4425f373541c42..aaf64a16c707162dc97f4ae4caf90f107ec8191a 100644 (file)
--- a/cmake/FindPango.cmake
+++ b/cmake/FindPango.cmake
@@ -5,6 +5,12 @@ if (PKG_CONFIG_FOUND)
     endif ()
     pkg_search_module(Pango ${_pkgconfig_REQUIRED} pango pangocairo)
     pkg_search_module(PangoFT2 ${_pkgconfig_REQUIRED} pangoft2)
+    if (Pango_LINK_LIBRARIES)
+        set(Pango_LIBRARIES ${Pango_LINK_LIBRARIES}) # HACK
+    endif()
+    if (PangoFT2_LINK_LIBRARIES)
+        set(PangoFT2_LIBRARIES ${PangoFT2_LINK_LIBRARIES}) # HACK
+    endif()
 else ()
     # find_path(Pango_INCLUDE_DIRS)
     # find_library(Pango_LIBRARIES)

diff --git a/libs/gtkutil/CMakeLists.txt b/libs/gtkutil/CMakeLists.txt
index 80eca88c62457f699f813b1d7cce4f00b93a0366..1d6df92b721ba88411df3b0e9549298e07fa7353 100644 (file)
--- a/libs/gtkutil/CMakeLists.txt
+++ b/libs/gtkutil/CMakeLists.txt
@@ -27,6 +27,7 @@ add_library(gtkutil STATIC
 target_include_directories(gtkutil PRIVATE uilib)
 target_link_libraries(gtkutil PRIVATE uilib)
 
+find_package(GTK${GTK_TARGET} REQUIRED)
 target_include_directories(gtkutil PRIVATE ${GTK${GTK_TARGET}_INCLUDE_DIRS})
 target_link_libraries(gtkutil PRIVATE ${GTK${GTK_TARGET}_LIBRARIES})
 

diff --git a/radiant/CMakeLists.txt b/radiant/CMakeLists.txt
index ae33bcea7dd884f5b0babe17e55691a6b323517b..8e0e7005f275e0ed2a170ced974d273906294316 100644 (file)
--- a/radiant/CMakeLists.txt
+++ b/radiant/CMakeLists.txt
@@ -1,6 +1,7 @@
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}")
 
 find_package(OpenGL REQUIRED)
+find_package(GTK${GTK_TARGET} REQUIRED)
 
 string(SUBSTRING ${CMAKE_SHARED_MODULE_SUFFIX} 1 -1 _clibext)
 add_definitions(-DCMAKE_SHARED_MODULE_SUFFIX="${_clibext}")

diff --git a/tools/quake3/q3map2/help.c b/tools/quake3/q3map2/help.c
index fe613d042936d168d0fe75255b46a242edb78a2d..a1fb1eaf45d517f67d58e6ba654948caa5ddac7f 100644 (file)
--- a/tools/quake3/q3map2/help.c
+++ b/tools/quake3/q3map2/help.c
@@ -215,6 +215,7 @@ void HelpLight()
                {"-export", "Export lightmaps when compile finished (like `-export` mode)"},
                {"-exposure <F>", "Lightmap exposure to better support overbright spots"},
                {"-external", "Force external lightmaps even if at size of internal lightmaps"},
+               {"-externalnames", "Write lightstyle shader using external lightmap names"},
                {"-extradist <F>", "Extra distance for lights in map units"},
                {"-extravisnudge", "Broken feature to nudge the luxel origin to a better vis cluster"},
                {"-extrawide", "Deprecated alias for `-super 2 -filter`"},

diff --git a/tools/quake3/q3map2/light.c b/tools/quake3/q3map2/light.c
index a2a1f62d62dba79d70926282cc8f26ff77005e2b..cff40a8590278320a707aaaad1bd40fbb0142764 100644 (file)
--- a/tools/quake3/q3map2/light.c
+++ b/tools/quake3/q3map2/light.c
@@ -2607,6 +2607,12 @@ int LightMain( int argc, char **argv ){
                        Sys_Printf( "Storing all lightmaps externally\n" );
                }
 
+               else if ( !strcmp( argv[ i ], "-externalnames" ) ) {
+                       externalLightmaps = qtrue;
+                       externalLightmapNames = qtrue;
+                       Sys_Printf( "Writing lightstyle shader using external lightmap names\n" );
+               }
+
                else if ( !strcmp( argv[ i ], "-lightmapsize" ) ) {
                        lmCustomSize = atoi( argv[ i + 1 ] );
 

diff --git a/tools/quake3/q3map2/lightmaps_ydnar.c b/tools/quake3/q3map2/lightmaps_ydnar.c
index 2802ecaf4370c223b2d8c3e29ce6b8061154ca9d..ee9902460b505c2912fc182f571986a4308a44b3 100644 (file)
--- a/tools/quake3/q3map2/lightmaps_ydnar.c
+++ b/tools/quake3/q3map2/lightmaps_ydnar.c
@@ -3415,7 +3415,8 @@ void StoreSurfaceLightmaps( qboolean fastAllocate, qboolean storeForReal ){
                                        olm = &outLightmaps[ lm->outLightmapNums[ lightmapNum ] ];
 
                                        /* lightmap name */
-                                       if ( lm->outLightmapNums[ lightmapNum ] == lm->outLightmapNums[ 0 ] ) {
+                                       if ( !externalLightmapNames
+                                               && lm->outLightmapNums[ lightmapNum ] == lm->outLightmapNums[ 0 ] ) {
                                                strcpy( lightmapName, "$lightmap" );
                                        }
                                        else{

diff --git a/tools/quake3/q3map2/q3map2.h b/tools/quake3/q3map2/q3map2.h
index aa852347e811cef9a6837697b07ca6b7c92388a0..40b13c1d7f1b1d37f7f058491f96946e5ec51b4d 100644 (file)
--- a/tools/quake3/q3map2/q3map2.h
+++ b/tools/quake3/q3map2/q3map2.h
@@ -2328,6 +2328,7 @@ Q_EXTERN qboolean noCollapse Q_ASSIGN( qfalse );
 Q_EXTERN int lightmapSearchBlockSize Q_ASSIGN( 0 );
 Q_EXTERN qboolean exportLightmaps Q_ASSIGN( qfalse );
 Q_EXTERN qboolean externalLightmaps Q_ASSIGN( qfalse );
+Q_EXTERN qboolean externalLightmapNames Q_ASSIGN( qfalse );
 Q_EXTERN int lmCustomSize Q_ASSIGN( LIGHTMAP_WIDTH );
 Q_EXTERN char *             lmCustomDir Q_ASSIGN( NULL );
 Q_EXTERN int lmLimitSize Q_ASSIGN( 0 );