Changeset 30282 for lang/cplusplus

Show
Ignore:
Timestamp:
02/19/09 20:32:06 (4 years ago)
Author:
saturday06
Message:

b

Location:
lang/cplusplus/i3/trunk
Files:
10 modified

Legend:

Unmodified
Added
Removed

  • lang/cplusplus/i3/trunk/am/i3.am

    r30277 r30282  
    8282# GNUstep 
    8383if WITH_GUI_GNUSTEP 
    84 i3_CXXFLAGS_DEFAULT += -DMOL_GUI_GNUSTEP 
    85 i3_CXXFLAGS_RELEASE += ${GNUSTEP2_CXXFLAGS} 
    86 i3_LDADD_RELEASE    += ${GNUSTEP2_LDFLAGS} 
     84i3_CXXFLAGS_DEFAULT += -DMOL_GUI_GNUSTEP ${GNUSTEP_CXXFLAGS} 
     85i3_LDADD_RELEASE    += ${GNUSTEP_LIBS} 
    8786endif 
    8887 
    … …  
    9089# Cocoa 
    9190if WITH_GUI_COCOA 
    92 i3_CXXFLAGS_DEFAULT += ${COCOA_CXXFLAGS} -DMOL_GUI_COCOA \ 
    93                        -I${COCOA_INCLUDES}/QtGui -I${COCOA_INCLUDES}/QtCore 
    94 i3_LDADD_DEFAULT    += ${COCOA_LDADD} ${COCOA_LIB_GUI} 
    95  
    96 if WITH_OS_WINDOWS 
    97 i3_LDADD_DEFAULT    += -lgdi32 -luser32 -lpsapi -lshlwapi 
     91i3_CXXFLAGS_DEFAULT += -DMOL_GUI_COCOA 
    9892endif 
    99 endif 

  • lang/cplusplus/i3/trunk/am/i3_debug.am

    r30276 r30282  
    4141 
    4242# --------------------------------------- 
    43 # gnustep 
     43# GNUstep 
    4444if WITH_GUI_GNUSTEP 
    45 i3_CXXFLAGS_DEBUG += 
    46 i3_LDFLAGS_DEBUG  +=  
    47 i3_LDADD_DEBUG    += ${GNUSTEP2_LIBS} 
    48 if WITH_CYGWIN  
    49 i3_LDADD_DEBUG    += -lmsimg32 -lole32 -luuid -lcomctl32 -lwsock32 -lsupc++ -luser32 -lgdi32 
    50 else 
    51 i3_LDADD_DEBUG    += -L/usr/local/lib -lgnustep2 -lX11 -lXi -lXinerama -lXft -lpthread -lm -lXext -lsupc++ 
    52 endif 
     45i3_LDADD_DEBUG    += ${GNUSTEP_LIBS} 
    5346endif 
    5447 

  • lang/cplusplus/i3/trunk/am/mol_test.am

    r30276 r30282  
    2828 
    2929# --------------------------------------- 
    30 # gnustep 
     30# GNUstep 
    3131if WITH_GUI_GNUSTEP 
    32 mol_test_CXXFLAGS += ${GNUSTEP2_CXXFLAGS} 
    33 mol_test_LDADD    += ${GNUSTEP2_LDFLAGS} 
     32mol_test_CXXFLAGS += ${GNUSTEP_CXXFLAGS} 
     33mol_test_LDADD    += ${GNUSTEP_LIBS} 
    3434endif 

  • lang/cplusplus/i3/trunk/am/mol_test_debug.am

    r30276 r30282  
    4747# gnustep 
    4848if WITH_GUI_GNUSTEP 
    49 mol_test_debug_CXXFLAGS += 
    50 mol_test_debug_LDADD    += ${GNUSTEP2_LIBS} 
     49mol_test_debug_CXXFLAGS += ${GNUSTEP_CXXFLAGS} 
     50mol_test_debug_LDADD    += ${GNUSTEP_LIBS} 
    5151endif 

  • lang/cplusplus/i3/trunk/configure.ac

    r30274 r30282  
    127127    ;; 
    128128    gnustep) 
    129         GNUSTEP_CXXFLAGS=`gnustep-config --objc-flags` 
    130         GNUSTEP_LIBS=`gnustep-config --objc-libs``gnustep-config --base-libs``gnustep-config --gui-libs` 
    131         AC_SUBST(GNUSTEP_CXXFLAGS) 
    132         AC_SUBST(GNUSTEP_LIBS) 
     129        which gnustep-config > /dev/null 
     130        if test $? -ne 0; then 
     131            echo "GNUstep not found." 
     132            exit 1 
     133        fi 
     134 
     135#        GNUSTEP_CXXFLAGS="`gnustep-config --objc-flags`" 
     136#        GNUSTEP_LIBS="`gnustep-config --objc-libs``gnustep-config --base-libs``gnustep-config --gui-libs`" 
     137        GNUSTEP_CXXFLAGS="-MMD -MP -DGNUSTEP -DGNUSTEP_BASE_LIBRARY=1 -DGNU_GUI_LIBRARY=1 -DGNU_RUNTIME=1 -DGNUSTEP_BASE_LIBRARY=1 -DGNUSTEP_WITH_DLL -g -Wall -DDEBUG -fno-omit-frame-pointer -DGSWARN -DGSDIAGNOSE -Wno-import -g -fno-strict-aliasing -fgnu-runtime -fconstant-string-class=NSConstantString -I. -I/home/Owner/GNUstep/Library/Headers -I/GNUstep/Local/Library/Headers -I/GNUstep/System/Library/Headers" 
     138        GNUSTEP_LIBS="-Wl,--enable-auto-import -fgnu-runtime -L/home/Owner/GNUstep/Library/Libraries -L/GNUstep/Local/Library/Libraries -L/GNUstep/System/Library/Libraries -lobjc -lws2_32 -ladvapi32 -lcomctl32 -luser32 -lcomdlg32 -lmpr -lnetapi32 -lm -I.-Wl,--enable-auto-import -fgnu-runtime -L/home/Owner/GNUstep/Library/Libraries -L/GNUstep/Local/Library/Libraries -L/GNUstep/System/Library/Libraries -lgnustep-base -lobjc -lws2_32 -ladvapi32 -lcomctl32 -luser32 -lcomdlg32 -lmpr -lnetapi32 -lm -I.-Wl,--enable-auto-import -fgnu-runtime -L/home/Owner/GNUstep/Library/Libraries -L/GNUstep/Local/Library/Libraries -L/GNUstep/System/Library/Libraries -lgnustep-gui -lgnustep-base -lobjc -lws2_32 -ladvapi32 -lcomctl32 -luser32 -lcomdlg32 -lmpr -lnetapi32 -lm -I." 
     139        AC_SUBST(GNUSTEP_CXXFLAGS) 
     140        AC_SUBST(GNUSTEP_LIBS) 
    133141    ;; 
    134142    *) 

  • lang/cplusplus/i3/trunk/src/PrecompiledHeaders.h

    r18130 r30282  
    88 
    99// TODO: NDEBUG,_DEBUG,... 
    10 #ifndef NDEBUG 
     10//#ifndef NDEBUG 
    1111 
    1212#include <mol/PrecompiledHeaders.h> 
    1313 
    14 #endif 
     14//#endif 
     15 

  • lang/cplusplus/i3/trunk/src/gui-gnustep/Gui.h

    r30276 r30282  
    11#pragma once 
    2  
    3 #define COCOA_NO_CAST_FROM_ASCII 
    4 #include <QApplication> 
    5 #include <QLabel> 
    6 #include <QChar> 
    7 #include <QString> 
    82 
    93// "_" macro 
    104#ifdef ENABLE_NLS 
    11 #  include "../intl/wlibintl.h" 
    12 #  define _(String) (QString::fromUtf16((const ushort*)(wgettext(String)))) 
     5#  define _(String) (gettext(String)) 
    136#else 
    14 #  define _(String) (QString::fromUtf16((const ushort*)(L##String))) 
     7#  define _(String) (String) 
    158#endif 
    169 
    … …  
    1811namespace i3 
    1912{ 
    20 typedef std::basic_string<QChar> string; 
    21 typedef boost::basic_format<QChar> format; 
    22 void alert(string message); 
    23 void init_gui_global_data(int argc,char *argv[]); 
     13typedef std::string string; 
     14typedef boost::format format; 
    2415} 
     16 

  • lang/cplusplus/i3/trunk/src/mol/include/mol/PrecompiledHeaders.h

    r30250 r30282  
    88#include "Environment.h" 
    99 
    10 #ifndef NDEBUG 
     10//#ifndef NDEBUG 
    1111 
    1212#ifdef _MSC_VER 
    … …  
    4444 
    4545#include <algorithm> 
    46 #include <bitset> 
     46//#include <bitset> 
    4747#include <cassert> 
    4848#include <cctype> 
    … …  
    5252#include <cmath> 
    5353#include <complex> 
    54 #include <csetjmp> 
     54//#include <csetjmp> 
    5555#include <csignal> 
    56 #include <cstdarg> 
     56//#include <cstdarg> 
    5757#include <cstddef> 
    5858#include <cstdio> 
    … …  
    8585#include <streambuf> 
    8686#include <string> 
    87 #include <typeinfo> 
     87//#include <typeinfo> 
    8888#include <utility> 
    89 #include <valarray> 
     89//#include <valarray> 
    9090#include <vector> 
    9191 
    … …  
    100100#include <boost/bind.hpp> 
    101101#include <boost/cast.hpp> 
    102 #include <boost/crc.hpp> 
     102//#include <boost/crc.hpp> 
    103103#include <boost/cstdint.hpp> 
    104104#include <boost/format.hpp> 
    … …  
    118118#include <boost/intrusive/list_hook.hpp> 
    119119#include <boost/lexical_cast.hpp> 
    120 #include <boost/math/common_factor.hpp> 
    121 #include <boost/math/special_functions/acosh.hpp> 
    122 #include <boost/math/special_functions/asinh.hpp> 
    123 #include <boost/math/special_functions/atanh.hpp> 
     120//#include <boost/math/common_factor.hpp> 
     121//#include <boost/math/special_functions/acosh.hpp> 
     122//#include <boost/math/special_functions/asinh.hpp> 
     123//#include <boost/math/special_functions/atanh.hpp> 
    124124#include <boost/mem_fn.hpp> 
    125125 
    … …  
    128128 
    129129 
    130 #include <boost/numeric/ublas/io.hpp> 
    131 #include <boost/numeric/ublas/matrix.hpp> 
    132 #include <boost/numeric/ublas/vector.hpp> 
     130//#include <boost/numeric/ublas/io.hpp> 
     131//#include <boost/numeric/ublas/matrix.hpp> 
     132//#include <boost/numeric/ublas/vector.hpp> 
    133133#include <boost/pool/object_pool.hpp> 
    134134#include <boost/pool/pool.hpp> 
    … …  
    148148#endif 
    149149 
    150 #include <boost/scoped_ptr.hpp> 
     150//#include <boost/scoped_ptr.hpp> 
    151151#include <boost/shared_ptr.hpp> 
    152152#include <boost/static_assert.hpp> 
    … …  
    156156#include <boost/utility.hpp> 
    157157 
     158#ifdef __OBJC__ 
     159#define Object MOL_BOOST_LAMBDA_OBJECT 
    158160#include <boost/lambda/lambda.hpp> 
     161#undef Object 
     162#endif 
    159163 
    160164#ifdef _MSC_VER 
    … …  
    162166#endif 
    163167 
    164 #endif 
     168//#endif // NDEBUG 

  • lang/cplusplus/i3/trunk/src/mol/include/mol/gui-cocoa/PrecompiledHeaders.h

    r30250 r30282  
    11#pragma once 
    22 
    3 #ifdef BOOL 
    4 #undef BOOL 
    5 #define MOL_UNDEFINE_BOOL 
    6 #endif 
    7  
    8 #import <Cocoa/Cocoa.h> 
    9  
    10 #ifdef MOL_UNDEFINE_BOOL 
    11 #define BOOL WINBOOL 
    12 #undef MOL_UNDEFINE_BOOL 
    13 #endif 
     3#include "../gui-gnustep/PrecompiledHeaders.h" 
    144 
    155 

  • lang/cplusplus/i3/trunk/src/mol/include/mol/gui-gnustep/PrecompiledHeaders.h

    r30276 r30282  
    1  
    2 /** 
    3  * 
    4  */ 
    5  
    61#pragma once 
    72 
    8 #define COCOA_NO_CAST_FROM_ASCII 
    9 #include <QApplication> 
    10 #include <QLabel> 
    11 #include <QChar> 
    12 #include <QString> 
     3#ifdef BOOL 
     4#undef BOOL 
     5#define MOL_UNDEFINE_BOOL 
     6#endif 
    137 
     8#import <Cocoa/Cocoa.h> 
     9 
     10#ifdef MOL_UNDEFINE_BOOL 
     11#define BOOL WINBOOL 
     12#undef MOL_UNDEFINE_BOOL 
     13#endif 
     14 
     15