Changeset 2874


Ignore:
Timestamp:
Dec 15, 2022, 3:44:48 PM (2 years ago)
Author:
bsmith
Message:

Linux: Fixes for building dwtestoo on Linux/gcc.
GTK cannot be included in an extern "C" section.
Make sure ARCH is not set on platforms other than MacOS.

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • TabularUnified trunk/Makefile.in

    r2873 r2874  
    22mandir=@mandir@
    33CC      =       @CC@
    4 PLATCCFLAGS = @PLATCCFLAGS@
     4CXX     =       @CXX@
     5PLATCCFLAGS =   @PLATCCFLAGS@
    56MLFLAGS =       -L.
    67include $(srcdir)/Version
    7 CCFLAGS = @CFLAGS@ $(PLATCCFLAGS) @ARCH@ -D@DW_DEFINE@ -DBUILD_DLL -DDW_RESOURCES -DVER_REV=$(VER_REV)
     8CCFLAGS =       @CFLAGS@ $(PLATCCFLAGS) @ARCH@ -D@DW_DEFINE@ -DBUILD_DLL -DDW_RESOURCES -DVER_REV=$(VER_REV)
    89LFLAGS  =       @LIBS@ @ARCH@
    9 ARFLAGS = @ARFLAGS@
     10ARFLAGS =       @ARFLAGS@
    1011INSTALL =       @INSTALL@
    1112DW_SRC  =       @DW_SRC@
     
    1415TARGET  =       @TARGET@
    1516SRCS    =       $(srcdir)/$(DW_DIR)/$(DW_SRC)
    16 BROWSER_OBJECT=@BROWSER_OBJECT@
    17 COMPAT_OBJECT =@COMPAT_OBJECT@
    18 INSTALL_COMPAT=@INSTALL_COMPAT@
    19 INSTALL_TEST  =@INSTALL_TEST@
     17BROWSER_OBJECT= @BROWSER_OBJECT@
     18COMPAT_OBJECT = @COMPAT_OBJECT@
     19INSTALL_COMPAT= @INSTALL_COMPAT@
     20INSTALL_TEST @INSTALL_TEST@
    2021OBJECTS =       dw.o $(BROWSER_OBJECT)
    2122SRCS2   =       $(srcdir)dwcompat.c
    2223OBJECTS2=       $(COMPAT_OBJECT)
    2324TARGET2=        @TARGET2@
    24 TARGETS = @TARGETS@
     25TARGETS =       @TARGETS@
    2526VER_MAJ =       $(DW_MAJOR_VERSION)
    2627VER_MIN =       $(DW_MINOR_VERSION)
    2728VER_REV =       @SVNVERSION@
    2829SOSUFFIX=       @SOSUFFIX@
    29 SONAME= @SONAME@
    30 LIBPREFIX = @LIBPREFIX@
    31 LIBSUFFIX = @LIBSUFFIX@
     30SONAME  =       @SONAME@
     31LIBPREFIX =     @LIBPREFIX@
     32LIBSUFFIX =     @LIBSUFFIX@
    3233prefix  =       $(DESTDIR)@prefix@
    3334SRCDIR=dwindows-$(VER_MAJ).$(VER_MIN)
    3435
    35 #.SUFFIXES:     .c .h
     36#.SUFFIXES:     .c .cpp .h .hpp
    3637
    3738#.c.o:
    3839#       $(CC) -c $(CCFLAGS) $(INCPATH) -o $@ $<
     40
     41#.cpp.o:
     42#       $(CXX) -c $(CCFLAGS) $(INCPATH) -o $@ $<
    3943
    4044
     
    196200
    197201dwtestoo.o: $(srcdir)/dwtestoo.cpp $(srcdir)/dw.h $(srcdir)/dw.hpp
    198         $(CC) -c $(INCPATH) $(CCFLAGS) -o $@ $(srcdir)/dwtestoo.cpp
     202        $(CXX) -c $(INCPATH) $(CCFLAGS) -o $@ $(srcdir)/dwtestoo.cpp
    199203
    200204dwtestoo: dwtestoo.o
  • TabularUnified trunk/configure

    r2759 r2874  
    46684668PLATCCFLAGS="-g -O2 -fPIC -Wall"
    46694669ARFLAGS="cqs"
     4670ARCH=""
    46704671
    46714672case "$target" in
  • TabularUnified trunk/configure.in

    r2759 r2874  
    126126PLATCCFLAGS="-g -O2 -fPIC -Wall"
    127127ARFLAGS="cqs"
     128ARCH=""
    128129
    129130case "$target" in
  • TabularUnified trunk/dw.h

    r2862 r2874  
    12321232
    12331233#else
     1234
     1235/* GTK Cannot be included in an extern "C" section */
     1236#ifdef __cplusplus
     1237}
     1238#endif
     1239
    12341240/* GTK Specific section */
     1241#ifndef _GNU_SOURCE
    12351242#define _GNU_SOURCE
     1243#endif
    12361244#include <gtk/gtk.h>
    12371245#if GTK_MAJOR_VERSION < 4
     
    12441252#endif
    12451253#include <gdk/gdkkeysyms.h>
     1254
     1255#ifdef __cplusplus
     1256extern "C" {
     1257#endif
     1258
    12461259#include <pthread.h>
    1247 #if !defined(GDK_WINDOWING_WIN32)
    12481260# include <dlfcn.h>
    1249 #endif
    12501261
    12511262#define DW_DT_LEFT               1
Note: See TracChangeset for help on using the changeset viewer.