diff --git a/CMakeLists.txt b/CMakeLists.txt index 99b8025..a67ddb7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,9 @@ # $HeadURL$ # $Revision$ -cmake_minimum_required (VERSION 3.6) +cmake_minimum_required (VERSION 2.8) + +project (TINES) set(GLFW_BUILD_DOCS OFF CACHE BOOL "" FORCE) set(GLFW_BUILD_TESTS OFF CACHE BOOL "" FORCE) @@ -19,6 +21,4 @@ find_package(OpenGL REQUIRED) include_directories(${OPENGL_INCLUDE_DIR}) -project (TINES) - add_subdirectory (src) diff --git a/src/os/unix/CMakeLists.txt b/src/os/unix/CMakeLists.txt index b14fa40..bc2b215 100644 --- a/src/os/unix/CMakeLists.txt +++ b/src/os/unix/CMakeLists.txt @@ -11,4 +11,4 @@ add_library(oslib loadfile.c graphics.c sound.c io.c) -target_link_libraries(oslib glfw ${OPENGL_glu_LIBRARY}) \ No newline at end of file +target_link_libraries(oslib glfw ${OPENGL_glu_LIBRARY} ${OPENGL_gl_LIBRARY}) diff --git a/src/os/unix/graphics.c b/src/os/unix/graphics.c index 9dd714c..8649f72 100644 --- a/src/os/unix/graphics.c +++ b/src/os/unix/graphics.c @@ -19,7 +19,7 @@ #include #include -#include +//#include #include @@ -433,4 +433,4 @@ int graphics_blit(long x, long y, long w, long h) int getKeyStatus(int key) { return mainWindow.keyArray[key].curState; -} \ No newline at end of file +} diff --git a/src/ppu/debug/ppu.debug.c b/src/ppu/debug/ppu.debug.c index a4b0927..0f88541 100644 --- a/src/ppu/debug/ppu.debug.c +++ b/src/ppu/debug/ppu.debug.c @@ -15,6 +15,7 @@ #include #include +#if 0 /* Allegro includes */ #ifdef __APPLE__ #define USE_CONSOLE @@ -367,3 +368,4 @@ void ppu_dumpPalette(int x, int y) rectfill(Buffer, x + 91 + (i % 4) * 20, y + 21 +(i / 4) * 20, x + 91 + (i % 4) * 20 + 20, y + 21 +(i / 4) * 20 + 20, ppu_readMemory(0x3F, i+0x10)); } } +#endif