stopped importing the main package from setup.py

Author: HexDecimal

setup.py

@@ -6,11 +6,9 @@
 except ImportError:
     from distutils.core import setup
 
-from tdl import __version__
-
 setup(
     name='tdl',
-    version=__version__,
+    version=open('tdl/version.txt', 'r').read(),
     author='Kyle Stewart',
     author_email='4B796C65+pythonTDL@gmail.com',
     description='Pythonic port of rogue-like library libtcod.',

tdl/__init__.py

@@ -1477,4 +1477,4 @@ def force_resolution(width, height):
 __author__ = 'Kyle Stewart'
 __contact__ = "4b796c65+pythonTDL@gmail.com"
 __email__ = "4b796c65+pythonTDL@gmail.com"
-__version__ = '1.2.0'
+__version__ = open(_os.path.join(__path__[0], 'version.txt'), 'r').read()

tdl/_libtcod.c

@@ -9190,29 +9190,29 @@ static const struct _cffi_type_context_s _cffi_type_context = {
 
 #ifdef PYPY_VERSION
 PyMODINIT_FUNC
-_cffi_pypyinit__libtcod(const void *p[])
+_cffi_pypyinit_tdl/_libtcod(const void *p[])
 {
     p[0] = (const void *)0x2601;
     p[1] = &_cffi_type_context;
 }
 #  ifdef _MSC_VER
      PyMODINIT_FUNC
 #  if PY_MAJOR_VERSION >= 3
-     PyInit__libtcod(void) { return NULL; }
+     PyInit_tdl/_libtcod(void) { return NULL; }
 #  else
-     init_libtcod(void) { }
+     inittdl/_libtcod(void) { }
 #  endif
 #  endif
 #elif PY_MAJOR_VERSION >= 3
 PyMODINIT_FUNC
-PyInit__libtcod(void)
+PyInit_tdl/_libtcod(void)
 {
-  return _cffi_init("_libtcod", 0x2601, &_cffi_type_context);
+  return _cffi_init("tdl/_libtcod", 0x2601, &_cffi_type_context);
 }
 #else
 PyMODINIT_FUNC
-init_libtcod(void)
+inittdl/_libtcod(void)
 {
-  _cffi_init("_libtcod", 0x2601, &_cffi_type_context);
+  _cffi_init("tdl/_libtcod", 0x2601, &_cffi_type_context);
 }
 #endif

tdl/build_libtcod.py

@@ -472,7 +472,10 @@
 
 """)
 
-ffi.set_source('_libtcod', """
+module_name = '_libtcod'
+
+
+ffi.set_source(module_name, """
 #include <libtcod.h>
 
 void set_char(TCOD_console_t console, int x, int y,
@@ -506,7 +509,7 @@
 }
 
 """,
-include_dirs=['include/', 'tdl/include/'],
+include_dirs=['include/', 'tdl/include/', 'tdl/include/Release/'],
 library_dirs=['lib/win32/', 'tdl/lib/win32/'],
 libraries=['libtcod-VS'])