gnustep/libs-sqlclient
0
0
Fork 0
mirror of https://github.com/gnustep/libs-sqlclient.git synced 2025-02-19 01:50:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

More changes to try to make library work with apple runtime/foundation

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/sqlclient/trunk@21597 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-Macdonald 2005-08-02 14:53:32 +00:00
parent 6e63e622ce
commit 4da9b3ba28
3 changed files with 35 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
GNUmakefile
View file

@ -23,7 +23,15 @@ SQLClient_AGSDOC_FILES = SQLClient.h
# Assume that the use of the gnu runtime means we have the gnustep
# base library and can use its extensions to build WebServer stuff.
#
ifeq ($(OBJC_RUNTIME_LIB), gnu)
ifeq ($(OBJC_RUNTIME_LIB),gnu)
APPLE=0
else
APPLE=1
endif
ifeq ($(APPLE),1)
ADDITIONAL_OBJC_LIBS += -lgnustep-baseadd
else
SQLClient_OBJC_FILES += WebServer.m WebServerBundles.m
SQLClient_HEADER_FILES += WebServer.h
SQLClient_AGSDOC_FILES += WebServer.h
@ -42,6 +50,13 @@ BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Bundles/SQLClient
# has _libs appended to the bundle name, and has the extra libraries linked.
ifneq ($(ECPG),)
ifeq ($(APPLE),1)
BUNDLE_NAME += ECPG
ECPG_OBJC_FILES = ECPG.m
ECPG_LIB_DIRS = -L./obj
ECPG_BUNDLE_LIBS += -lSQLClient -lecpg
ECPG_PRINCIPAL_CLASS = SQLClientECPG
else
BUNDLE_NAME += ECPG
ECPG_OBJC_FILES = ECPG.m
ECPG_LIB_DIRS = -L./obj
@ -52,6 +67,7 @@ ECPG_libs_OBJC_FILES = ECPG.m
ECPG_libs_LIB_DIRS = -L./obj
ECPG_libs_BUNDLE_LIBS += -lSQLClient -lgnustep-base -lobjc -lecpg
ECPG_libs_PRINCIPAL_CLASS = SQLClientECPG_libs
endif
TEST_TOOL_NAME += testECPG
testECPG_OBJC_FILES = testECPG.m
testECPG_TOOL_LIBS += -lSQLClient
@ -59,6 +75,13 @@ testECPG_LIB_DIRS += -L./obj
endif
ifneq ($(POSTGRES),)
ifeq ($(APPLE),1)
BUNDLE_NAME += Postgres
Postgres_OBJC_FILES = Postgres.m
Postgres_LIB_DIRS = -L./obj
Postgres_BUNDLE_LIBS += -lSQLClient -lpq
Postgres_PRINCIPAL_CLASS = SQLClientPostgres
else
BUNDLE_NAME += Postgres
Postgres_OBJC_FILES = Postgres.m
Postgres_LIB_DIRS = -L./obj
@ -69,6 +92,7 @@ Postgres_libs_OBJC_FILES = Postgres.m
Postgres_libs_LIB_DIRS = -L./obj
Postgres_libs_BUNDLE_LIBS += -lSQLClient -lgnustep-base -lobjc -lpq
Postgres_libs_PRINCIPAL_CLASS = SQLClientPostgres_libs
endif
TEST_TOOL_NAME += testPostgres
testPostgres_OBJC_FILES = testPostgres.m
testPostgres_LIB_DIRS += -L./obj
@ -76,6 +100,13 @@ testPostgres_TOOL_LIBS += -lSQLClient
endif
ifneq ($(MYSQL),)
ifeq ($(APPLE),1)
BUNDLE_NAME += MySQL
MySQL_OBJC_FILES = MySQL.m
MySQL_LIB_DIRS = -L./obj
MySQL_BUNDLE_LIBS += -lSQLClient -lmysqlclient
MySQL_PRINCIPAL_CLASS = SQLClientMySQL
else
BUNDLE_NAME += MySQL
MySQL_OBJC_FILES = MySQL.m
MySQL_LIB_DIRS = -L./obj
@ -86,6 +117,7 @@ MySQL_libs_OBJC_FILES = MySQL.m
MySQL_libs_LIB_DIRS = -L./obj
MySQL_libs_BUNDLE_LIBS += -lSQLClient -lgnustep-base -lobjc -lmysqlclient
MySQL_libs_PRINCIPAL_CLASS = SQLClientMySQL_libs
endif
TEST_TOOL_NAME += testMySQL
testMySQL_OBJC_FILES = testMySQL.m
testMySQL_LIB_DIRS += -L./obj

2
SQLClient.h
View file

@ -175,6 +175,8 @@
#include <Foundation/NSObject.h>
#include <Foundation/NSArray.h>
#include <GNUstepBase/GNUstep.h>
@class NSData;
@class NSDate;
@class NSMutableSet;

1
SQLClient.m
View file

@ -45,7 +45,6 @@
#include <Foundation/NSPathUtilities.h>
#include <Foundation/NSSet.h>
#include <GNUstepBase/GNUstep.h>
#include <GNUstepBase/GSLock.h>
#include "SQLClient.h"