haiwen/libsearpc
1
0
Fork 0
mirror of https://github.com/haiwen/libsearpc.git synced 2025-09-04 14:24:46 +00:00
Code Issues Releases Wiki Activity

[win] fixed a few problems on windows

Browse Source
This commit is contained in:
lins_win7
2012-05-09 16:16:50 +08:00
parent 47ffe05a59
commit 57703f8652
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
json-glib/configure.ac
View File

@@ -42,8 +42,8 @@ AM_PATH_GLIB_2_0
AM_PROG_CC_C_O
LT_PREREQ([2.2.6])
LT_INIT([disable-shared])
dnl LT_INIT([disable-static])
dnl LT_INIT([disable-shared])
LT_INIT([disable-static])
# Honor aclocal flags
ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"

8
json-glib/json-glib/Makefile.am
View File

@@ -74,11 +74,11 @@ glib_marshal_list = json-marshal.list
glib_marshal_prefix = _json_marshal
include $(top_srcdir)/build/autotools/Makefile.am.marshal
noinst_LTLIBRARIES = libjson-glib.la
lib_LTLIBRARIES = libsearpc-json-glib.la
libjson_glib_la_LIBADD = $(JSON_LIBS)
libjson_glib_la_SOURCES = $(source_c) $(source_h) $(source_h_private) $(BUILT_SOURCES)
libjson_glib_la_LDFLAGS = $(JSON_LT_LDFLAGS) -export-dynamic -export-symbols-regex "^json.*" -rpath $(libdir)
libsearpc_json_glib_la_LIBADD = $(JSON_LIBS)
libsearpc_json_glib_la_SOURCES = $(source_c) $(source_h) $(source_h_private) $(BUILT_SOURCES)
libsearpc_json_glib_la_LDFLAGS = $(JSON_LT_LDFLAGS) -export-dynamic -export-symbols-regex "^json.*" -rpath $(libdir)
jsonincludedir = $(includedir)/searpc/json-glib
jsoninclude_DATA = \

2
json-glib/json-glib/tests/Makefile.am
View File

@@ -13,7 +13,7 @@ INCLUDES = \
AM_CPPFLAGS = $(JSON_DEBUG_CFLAGS) -DTESTS_DATA_DIR=\""$(top_srcdir)/json-glib/tests"\"
AM_CFLAGS = -g $(JSON_CFLAGS) $(MAINTAINER_CFLAGS)
LDADD = \
../libjson-glib.la \
../libsearpc-json-glib.la \
$(JSON_LIBS) \
$(NULL)

2
lib/Makefile.am
View File

@@ -40,7 +40,7 @@ libsearpc_la_SOURCES = searpc-client.c searpc-server.c $(generated_sources)
libsearpc_la_LDFLAGS = -version-info 1:1:0 -no-undefined
libsearpc_la_LIBADD = @GLIB_LIBS@ \
${top_builddir}/json-glib/json-glib/libjson-glib.la
${top_builddir}/json-glib/json-glib/libsearpc-json-glib.la
genrpc_files = gencode.py rpc_table.py

2
pysearpc/client.py
View File

@@ -97,7 +97,7 @@ def searpc_func(ret_type, param_types):
return fret(ret_str)
if ret_obj_class:
if ret_type == "objlist" or ret_type == "object":
return newfunc_obj
else:
return newfunc