Changeset 04ef932 in nscp for build.cmake

Timestamp:

08/10/11 07:37:24 (22 months ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

54ac968

Parents:

e11d494

Message:

2011-08-10

• Fixed so it builds and runs on linux (but parser had issues so disabled som grammar rules whichneeds to be enabled again)
• Added a lot of freatures and cleand up the PythonScript module
• Started to merge som features from PythonScript back to Lua script

2011-08-07

• Fixed a lot of issues with PythonScript module adding suport for alias and "raw command processing"
• Fixed issue with loading plugins and aliases as well as duplicate plugin detection

2011-08-01

• Added new module: PythonScript

File:

• build.cmake (modified) (2 diffs)

build.cmake

@@ -11 +11 @@
     MESSAGE(STATUS "Detected x64")
     SET(INC_NSCP_LIBRARYDIR D:/source/lib/x64)  
+    SET(PYTHON_ROOT c:/python/27x64)  
   ELSE()
     MESSAGE(STATUS "Detected w32")
     SET(INC_NSCP_LIBRARYDIR D:/source/lib/x86)
+    SET(PYTHON_ROOT c:/python/27) 
   ENDIF()
 
   SET(INC_GOOGLE_BREAKPAD_DIR "D:/source/libraries/google-breakpad-svn")
     
-  SET(INC_BOOST_INCLUDEDIR "${INC_NSCP_INCLUDEDIR}")
+  SET(INC_BOOST_INCLUDEDIR "D:/source/include/boost-1_47")
   SET(INC_BOOST_LIBRARYDIR "${INC_NSCP_LIBRARYDIR}")
   SET(INC_PROTOBUF_LIBRARYDIR "${INC_NSCP_LIBRARYDIR}")
@@ -35 +37 @@
 
   SET(INC_OPENSSL_INCLUDEDIR "/usr/include/")
+  SET(PROTOBUF_INCLUDE_DIR "/usr/include/")
 
 ENDIF(WIN32)