Linux build fixes, switch to python3

Bindings/Scripts/create_lua_library/create_lua_library.py

@@ -1,5 +1,5 @@
 import sys
-import CppHeaderParser
+import CppHeaderParser3
 import os
 import errno
 import re
@@ -156,16 +156,16 @@ def createLUABindings(inputPath, prefix, mainInclude, libSmallName, libName, api
 					for line in f.readlines():
 						inheritInModule.append(line.strip().split("/",1)[-1]) # Strip whitespace, path/
 		
-		print "Parsing %s" % fileName
+		print("Parsing %s" % fileName)
 		try: # One input file parse.
 			f = open(fileName) # Def: Input file handle
 			contents = f.read().replace("_PolyExport", "") # Def: Input file contents, strip out "_PolyExport"
-			cppHeader = CppHeaderParser.CppHeader(contents, "string") # Def: Input file contents, parsed structure
+			cppHeader = CppHeaderParser3.CppHeader(contents, "string") # Def: Input file contents, parsed structure
 			ignore_classes = ["PolycodeShaderModule", "Object", "Threaded", "OpenGLCubemap", "PolyBase"]
 
 			# Iterate, check each class in this file.
 			for ckey in cppHeader.classes: 
-				print ">> Parsing class %s" % ckey
+				print(">> Parsing class %s" % ckey)
 				c = cppHeader.classes[ckey] # Def: The class structure
 
 				luaClassBindingOut = "" # Def: The local lua file to generate for this class.
@@ -433,7 +433,7 @@ def createLUABindings(inputPath, prefix, mainInclude, libSmallName, libName, api
 						paramIndex = 0
 						for param in pm["parameters"]:
 							if "name" in param:
-								if not param.has_key("type"):
+								if not "type" in param:
 									continue
 								if param["type"] == "0":
 									continue
@@ -485,7 +485,7 @@ def createLUABindings(inputPath, prefix, mainInclude, libSmallName, libName, api
 						paramlist = []
 						lparamlist = []
 						for param in pm["parameters"]:
-							if not param.has_key("type"):
+							if not "type" in param:
 								continue
 							if param["type"] == "0":
 								continue
@@ -744,8 +744,8 @@ def createLUABindings(inputPath, prefix, mainInclude, libSmallName, libName, api
 
 				luaDocOut += "\t</class>\n"
 	
-		except CppHeaderParser.CppParseError,  e: # One input file parse; failed.
-			print e
+		except CppHeaderParser3.CppParseError as e: # One input file parse; failed.
+			print(e)
 			sys.exit(1)
 
 	luaDocOut += "</classes>\n"

CMake/FindPythonModule.cmake

@@ -10,7 +10,7 @@ function(find_python_module module)
 		# A module's location is usually a directory, but for binary modules
 		# it's a .so file.
 		execute_process(COMMAND "${PYTHON_EXECUTABLE}" "-c" 
-			"import re, ${module}; print re.compile('/__init__.py.*').sub('',${module}.__file__)"
+			"import re, ${module}; print(re.compile('/__init__.py.*').sub('',${module}.__file__))"
 			RESULT_VARIABLE _${module}_status 
 			OUTPUT_VARIABLE _${module}_location
 			ERROR_QUIET 

Modules/Bindings/2DPhysics/CMakeLists.txt

@@ -35,6 +35,10 @@ IF(POLYCODE_INSTALL_FRAMEWORK)
     # install headers
     INSTALL(FILES ${polycode2DPhysics_HDRS} 
         DESTINATION Bindings/Lua/Modules/2DPhysics/include)
+	
+IF(NOT APPLE)
+    INSTALL(FILES API/Physics2D.pak DESTINATION Player)
+ENDIF(NOT APPLE)
 
 	INSTALL(DIRECTORY API DESTINATION Bindings/Lua/Modules/2DPhysics)
 	INSTALL(TARGETS Physics2DLua DESTINATION Bindings/Lua/Modules/2DPhysics/lib)

Modules/Bindings/3DPhysics/CMakeLists.txt

@@ -36,6 +36,9 @@ IF(POLYCODE_INSTALL_FRAMEWORK)
     # install headers
     INSTALL(FILES ${polycode3DPhysics_HDRS} 
         DESTINATION Bindings/Lua/Modules/3DPhysics/include)
+IF(NOT APPLE)
+    INSTALL(FILES API/Physics3D.pak DESTINATION Player)
+ENDIF(NOT APPLE)
 
     INSTALL(DIRECTORY API DESTINATION Bindings/Lua/Modules/3DPhysics)
     INSTALL(TARGETS Physics3DLua DESTINATION Bindings/Lua/Modules/3DPhysics/lib)

Modules/Bindings/UI/CMakeLists.txt

@@ -32,6 +32,10 @@ IF(POLYCODE_INSTALL_FRAMEWORK)
     # install headers
     INSTALL(FILES ${polycodeUI_HDRS} DESTINATION Bindings/Lua/Modules/UI/include)
 
+IF(NOT APPLE)
+    INSTALL(FILES API/UI.pak DESTINATION Player)
+ENDIF(NOT APPLE)
+
     INSTALL(DIRECTORY API DESTINATION Bindings/Lua/Modules/UI)
     INSTALL(TARGETS UILua DESTINATION Bindings/Lua/Modules/UI/lib)
     

Player/Contents/CMakeLists.txt

@@ -296,6 +296,17 @@ ELSE(MSVC OR MINGW)
 INCLUDE_DIRECTORIES(
     ${LUA_INCLUDE_DIR}
     ${Polycode_SOURCE_DIR}/Bindings/Contents/LUA/Include
+ 
+    ${Polycode_SOURCE_DIR}/Modules/Contents/UI/Include
+    ${Polycode_SOURCE_DIR}/Modules/Bindings/UI/Include
+
+    ${BOX2D_INCLUDE_DIR}
+    ${Polycode_SOURCE_DIR}/Modules/Contents/2DPhysics/Include
+    ${Polycode_SOURCE_DIR}/Modules/Bindings/2DPhysics/Include
+
+    ${BULLET_INCLUDE_DIR}
+    ${Polycode_SOURCE_DIR}/Modules/Contents/3DPhysics/Include
+    ${Polycode_SOURCE_DIR}/Modules/Bindings/3DPhysics/Include
     Include
     ../../Core/Contents/PolycodeView/Linux/
 )
@@ -321,40 +332,80 @@ INCLUDE_DIRECTORIES(
         Include/PolycodeLinuxPlayer.h
     )
  
-    INCLUDE_DIRECTORIES(Include)
- 
     ADD_EXECUTABLE(PolycodePlayer ${polycodeplayer_SRCS} ${polycodeplayer_HDRS})
     ADD_EXECUTABLE(StandalonePlayer ${polycodeplayerstandalone_SRCS} ${polycodeplayerstandalone_HDRS})
     
 
     TARGET_LINK_LIBRARIES(PolycodePlayer 
+	rt
+	dl
+	pthread
         PolycodeLua 
         Polycore 
         ${LUA_LIBRARY}
-        ${OPENGL_LIBRARIES}
-        ${OPENAL_LIBRARY}
-        ${PNG_LIBRARIES}
         ${FREETYPE_LIBRARIES}
-        ${PHYSFS_LIBRARY}
-        ${OGG_LIBRARY}
-        ${VORBIS_LIBRARY}
         ${VORBISFILE_LIBRARY}
+        ${VORBIS_LIBRARY}
+        ${OGG_LIBRARY}
+        ${OPENAL_LIBRARY}
+        ${PHYSFS_LIBRARY}
+        ${PNG_LIBRARIES}
+        ${ZLIB_LIBRARY}
+        ${OPENGL_LIBRARIES}
         ${SDL_LIBRARY}
+	Physics2DLua
+	Physics3DLua
+	UILua
+	Polycode2DPhysics
+	Polycode3DPhysics
+	PolycodeUI
+	${BOX2D_RELEASE_LIBRARY}
+        optimized ${LIBBULLETMULTITHREADED}
+        optimized ${LIBBULLETSOFTBODY} 
+        optimized ${LIBBULLETDYNAMICS} 
+        optimized ${LIBBULLETCOLLISION}
+        optimized ${LIBBULLETMATH}            
+        debug ${LIBBULLETMULTITHREADED_DEBUG}
+        debug ${LIBBULLETSOFTBODY_DEBUG} 
+        debug ${LIBBULLETDYNAMICS_DEBUG} 
+        debug ${LIBBULLETCOLLISION_DEBUG}
+        debug ${LIBBULLETMATH_DEBUG}  
      )
 
     TARGET_LINK_LIBRARIES(StandalonePlayer 
+	rt
+	dl
+	pthread
         PolycodeLua 
         Polycore 
         ${LUA_LIBRARY}
-        ${OPENGL_LIBRARIES}
-        ${OPENAL_LIBRARY}
-        ${PNG_LIBRARIES}
         ${FREETYPE_LIBRARIES}
-        ${PHYSFS_LIBRARY}
-        ${OGG_LIBRARY}
-        ${VORBIS_LIBRARY}
         ${VORBISFILE_LIBRARY}
+        ${VORBIS_LIBRARY}
+        ${OGG_LIBRARY}
+        ${OPENAL_LIBRARY}
+        ${PHYSFS_LIBRARY}
+        ${PNG_LIBRARIES}
+        ${ZLIB_LIBRARY}
+        ${OPENGL_LIBRARIES}
         ${SDL_LIBRARY}
+	Physics2DLua
+	Physics3DLua
+	UILua
+	Polycode2DPhysics
+	Polycode3DPhysics
+	PolycodeUI
+	${BOX2D_RELEASE_LIBRARY}
+        optimized ${LIBBULLETMULTITHREADED}
+        optimized ${LIBBULLETSOFTBODY} 
+        optimized ${LIBBULLETDYNAMICS} 
+        optimized ${LIBBULLETCOLLISION}
+        optimized ${LIBBULLETMATH}            
+        debug ${LIBBULLETMULTITHREADED_DEBUG}
+        debug ${LIBBULLETSOFTBODY_DEBUG} 
+        debug ${LIBBULLETDYNAMICS_DEBUG} 
+        debug ${LIBBULLETCOLLISION_DEBUG}
+        debug ${LIBBULLETMATH_DEBUG}  
      )
 
     

Standalone/CMakeLists.txt

@@ -48,10 +48,16 @@ ELSE(MSVC OR MINGW)
 	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Player/default.pak DESTINATION Player)
 	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Player/hdr.pak DESTINATION Player)
 	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Player/api.pak DESTINATION Player)
+	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Player/UI.pak DESTINATION Player)
+	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Player/Physics2D.pak DESTINATION Player)
+	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Player/Physics3D.pak DESTINATION Player)
 	INSTALL(PROGRAMS ${POLYCODE_RELEASE_DIR}/Framework/Player/StandalonePlayer DESTINATION Publish/Linux)
 	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Player/default.pak DESTINATION Publish/Linux)
 	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Player/hdr.pak DESTINATION Publish/Linux)
 	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Player/api.pak DESTINATION Publish/Linux)
+	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Player/UI.pak DESTINATION Publish/Linux)
+	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Player/Physics2D.pak DESTINATION Publish/Linux)
+	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Player/Physics3D.pak DESTINATION Publish/Linux)
 	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Player/main.polyapp DESTINATION Publish/Linux)
 
 INSTALL(PROGRAMS ${POLYCODE_RELEASE_DIR}/Framework/Tools/polybuild DESTINATION Bin)