diff options
Diffstat (limited to 'cppe')
| -rw-r--r-- | cppe/config/TestUtil.py | 4 | ||||
| -rw-r--r-- | cppe/src/IceEC/Makefile | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cppe/config/TestUtil.py b/cppe/config/TestUtil.py index 8a1b7a6ffde..3ee1dac45e1 100644 --- a/cppe/config/TestUtil.py +++ b/cppe/config/TestUtil.py @@ -26,12 +26,12 @@ import sys, os, re def getIceVersion(): config = open(os.path.join(toplevel, "include", "IceE", "Config.h"), "r") - return re.search("ICEE_STRING_VERSION \"([0-9\.]*)\"", config.read()).group(1) + return re.search("ICE_STRING_VERSION \"([0-9\.]*)\"", config.read()).group(1) def getIceSoVersion(): config = open(os.path.join(toplevel, "include", "IceE", "Config.h"), "r") - intVersion = int(re.search("ICEE_INT_VERSION ([0-9]*)", config.read()).group(1)) + intVersion = int(re.search("ICE_INT_VERSION ([0-9]*)", config.read()).group(1)) majorVersion = intVersion / 10000 minorVersion = intVersion / 100 - 100 * majorVersion return '%d' % (majorVersion * 10 + minorVersion) diff --git a/cppe/src/IceEC/Makefile b/cppe/src/IceEC/Makefile index af936c3d52e..db516317850 100644 --- a/cppe/src/IceEC/Makefile +++ b/cppe/src/IceEC/Makefile @@ -114,7 +114,7 @@ endif %.o: $(ICE_DIR)/%.cpp $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< -CPPFLAGS := -I.. $(CPPFLAGS) -DICE_API_EXPORTS -DICEE_PURE_CLIENT +CPPFLAGS := -I.. $(CPPFLAGS) -DICE_API_EXPORTS -DICE_PURE_CLIENT SLICE2CPPEFLAGS := --ice --include-dir IceE --dll-export ICE_API $(SLICE2CPPEFLAGS) LINKWITH := $(ICE_OS_LIBS) |