Merge pull request #328 from rlakis/master

Fix Mac OS compilation

.gitignore

@@ -29,4 +29,7 @@ build*/
 *.db
 # Visual Studio 2015 cache/options directory
 .vs/
-
+#XCode
+.DS_Store
+xcuserdata
+project.xcworkspace

CMakeLists.txt

@@ -428,14 +428,14 @@ if(APPLE)
 	                "Please get in contact to tell us of your results.")
 	add_definitions(-DIBPP_DARWIN)
 	list(APPEND FR_LIBS -lfbclient)
-
+        list(APPEND FR_LIBS -L/Library/Frameworks/Firebird.framework/Versions/Current/Libraries)
+
     list(APPEND SOURCE_LIST
         ${SOURCEDIR}/gui/mac/StyleGuideMAC.cpp
     )
 
     add_definitions(-DFR_INSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}")
-    list(APPEND FR_LIBS -lfbclient)
-
+
     # Create the revision include file
     execute_process(
         COMMAND "${CMAKE_SOURCE_DIR}/update-revision-info.sh"
@@ -526,6 +526,7 @@ endif (APPLE)
 
 target_link_libraries(${PROJECT_NAME} IBPP ${wxWidgets_LIBRARIES} ${FR_LIBS})
 
+
 #--------------------------------------
 # Install
 if (UNIX AND NOT APPLE)

src/config/Config.h

@@ -44,7 +44,7 @@ class wxFileConfig;
 
 //! Do not instantiate objects of this class. Use config() function (see below).
 
-#if defined(__UNIX__) && !defined(__WXMAC_OSX__)
+#if defined(__UNIX__) && !defined(__WXOSX_COCOA__)
     #define FR_CONFIG_USE_PRIVATE_STDPATHS
 #else
     #undef FR_CONFIG_USE_PRIVATE_STDPATHS

src/main.cpp

@@ -80,6 +80,10 @@ bool Application::OnInit()
     checkEnvironment();
     parseCommandLine();
 
+#if defined(__WXOSX_COCOA__)
+    std::locale::global(std::locale(""));
+#endif
+
     // initialize IBPP library - if it fails: exit
     try
     {