Build fixes for linux from changes made for Qt windows compatibility.

src/CMakeLists.txt

@@ -20,7 +20,9 @@ if(WIN32)
      add_definitions( -DFCEUDEF_DEBUGGER )
      include_directories( C:/SDL2/include )
      include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/drivers/win/zlib )
+     set( OPENGL_LDFLAGS  OpenGL::GL )
      set( SDL2_LDFLAGS  C:/SDL2/lib/x64/SDL2.lib )
+     set( SYS_LIBS  wsock32 ws2_32 )
 else(WIN32)
   # Non Windows System
   # UNIX (Linux or Mac OSX)
@@ -58,6 +60,7 @@ else(WIN32)
   pkg_check_modules( MINIZIP REQUIRED minizip)
 
   if ( ${MINIZIP_FOUND} )
+	  message( STATUS "Using System minizip ${MINIZIP_VERSION}" )
 	  add_definitions( -D_SYSTEM_MINIZIP ${MINIZIP_CFLAGS} )
   endif()
 
@@ -72,6 +75,7 @@ else(WIN32)
 
   # Check for zlib
   if ( ${ZLIB_FOUND} )
+	  message( STATUS "Using System zlib ${ZLIB_VERSION_STRING}" )
 	  #add_definitions( ${ZLIB_CFLAGS} )
 	  include_directories( ${ZLIB_INCLUDE_DIRS} )
   endif()
@@ -86,7 +90,19 @@ else(WIN32)
   # Check for LUA
   pkg_search_module( LUA lua5.1 lua-5.1 )
 
-  if ( ${LUA_FOUND} )
+  add_definitions( -DHAVE_ASPRINTF ) # What system wouldn't have this?
+  #add_definitions( -DCREATE_AVI    ) 
+
+  if(APPLE)
+	set( OPENGL_LDFLAGS  "-framework OpenGL" )
+  else()
+	set( OPENGL_LDFLAGS  ${OPENGL_LIBRARIES} )
+  	set( SYS_LIBS  -lrt  -lpthread )
+  endif()
+
+endif(WIN32)
+
+if ( ${LUA_FOUND} )
    # Use System LUA
         message( STATUS "Using System Lua ${LUA_VERSION}" )
 
@@ -94,7 +110,7 @@ else(WIN32)
 
         set( LUA_ENGINE_SOURCE  ${CMAKE_CURRENT_SOURCE_DIR}/lua-engine.cpp )
 
-  else ()
+else ()
 
    # Use Internal LUA
         message( STATUS "Using Internal Lua" )
@@ -134,21 +150,13 @@ else(WIN32)
       ${CMAKE_CURRENT_SOURCE_DIR}/lua/src/print.c
       ${CMAKE_CURRENT_SOURCE_DIR}/lua-engine.cpp 
    )
-  endif()
+endif()
 
-  add_definitions( -DHAVE_ASPRINTF ) # What system wouldn't have this?
+if ( NOT ${ZLIB_FOUND} )
-  #add_definitions( -DCREATE_AVI    ) 
 
-  if(APPLE)
+   message( STATUS "Using Internal zlib" )
-	set( OPENGL_LDFLAGS  "-framework OpenGL" )
-  else()
-	set( OPENGL_LDFLAGS  ${OPENGL_LIBRARIES} )
-  	set( SYS_LIBS  -lrt  -lpthread )
-  endif()
 
-endif(WIN32)
+   set( ZLIB_SOURCE 
-
-set( ZLIB_SOURCE 
        ${CMAKE_CURRENT_SOURCE_DIR}/drivers/win/zlib/adler32.c 
        ${CMAKE_CURRENT_SOURCE_DIR}/drivers/win/zlib/compress.c 
        ${CMAKE_CURRENT_SOURCE_DIR}/drivers/win/zlib/crc32.c 
@@ -165,6 +173,7 @@ set( ZLIB_SOURCE
        ${CMAKE_CURRENT_SOURCE_DIR}/drivers/win/zlib/unzip.c 
        ${CMAKE_CURRENT_SOURCE_DIR}/drivers/win/zlib/zutil.c 
    	)
+endif()
 
 include_directories( ${CMAKE_SOURCE_DIR}/src )
 include_directories( ${CMAKE_SOURCE_DIR}/src/drivers )
@@ -397,7 +406,6 @@ set(SRC_CORE
   	${CMAKE_CURRENT_SOURCE_DIR}/input/lcdcompzapper.cpp
   	${CMAKE_CURRENT_SOURCE_DIR}/input/zapper.cpp
   	${CMAKE_CURRENT_SOURCE_DIR}/utils/backward.cpp
-  	${CMAKE_CURRENT_SOURCE_DIR}/utils/ConvertUTF.c
   	${CMAKE_CURRENT_SOURCE_DIR}/utils/xstring.cpp
   	${CMAKE_CURRENT_SOURCE_DIR}/utils/crc32.cpp     
   	${CMAKE_CURRENT_SOURCE_DIR}/utils/endian.cpp  
@@ -532,7 +540,7 @@ else()
 target_link_libraries( ${APP_NAME}  
    ${Qt5Widgets_LIBRARIES}
    ${Qt5OpenGL_LIBRARIES}
-   ${OPENGL_LDFLAGS}  OpenGL::GL
+   ${OPENGL_LDFLAGS}  
  	${SDL2_LDFLAGS}
 	${MINIZIP_LDFLAGS} ${ZLIB_LIBRARIES}
 	${LUA_LDFLAGS}
@@ -540,9 +548,11 @@ target_link_libraries( ${APP_NAME}
 )
 endif()
 
-target_link_libraries( ${APP_NAME} wsock32 ws2_32 )
+if (WIN32)
+	#   target_link_libraries( ${APP_NAME} wsock32 ws2_32 )
 
-set_target_properties(${APP_NAME} PROPERTIES WIN32_EXECUTABLE TRUE)
+   set_target_properties(${APP_NAME} PROPERTIES WIN32_EXECUTABLE TRUE)
+endif()
 
 if (APPLE)
 

src/drivers/Qt/ConsoleDebugger.cpp

@@ -54,7 +54,7 @@
 #include "../../asm.h"
 #include "../../ppu.h"
 #include "../../x6502.h"
-#include "../../common/os_utils.h"
+#include "common/os_utils.h"
 #include "common/configSys.h"
 
 #include "Qt/main.h"

src/drivers/Qt/LuaControl.cpp

@@ -32,12 +32,13 @@
 #include <QMessageBox>
 
 #include "../../fceu.h"
-#include "../../common/os_utils.h"
 
 #ifdef _S9XLUA_H
 #include "../../fceulua.h"
 #endif
 
+#include "common/os_utils.h"
+
 #include "Qt/LuaControl.h"
 #include "Qt/main.h"
 #include "Qt/input.h"

src/drivers/Qt/TraceLogger.cpp

@@ -41,7 +41,8 @@
 #include "../../ines.h"
 #include "../../nsf.h"
 #include "../../movie.h"
-#include "../../common/os_utils.h"
+
+#include "common/os_utils.h"
 
 #include "Qt/ConsoleUtilities.h"
 #include "Qt/TraceLogger.h"

src/drivers/Qt/config.cpp

@@ -41,10 +41,14 @@
 #include <cerrno>
 #include <cstdio>
 #include <cstdlib>
-//#include <sys/time.h>
+
-//#include <sys/stat.h>
+#ifdef WIN32
-//#include <sys/types.h>
 #include <direct.h>
+#else
+#include <sys/time.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#endif
 
 static const char* HotkeyStrings[HK_MAX] = {
 		"CheatMenu",

src/drivers/Qt/fceuWrapper.cpp

@@ -48,12 +48,12 @@
 #include "../../fceu.h"
 #include "../../movie.h"
 #include "../../version.h"
-#include "../../common/os_utils.h"
 
 #ifdef _S9XLUA_H
 #include "../../fceulua.h"
 #endif
 
+#include "common/os_utils.h"
 #include "common/configSys.h"
 #include "../../oldmovie.h"
 #include "../../types.h"

src/drivers/common/configSys.cpp

@@ -4,7 +4,9 @@
 #include <string.h>
 #include <stdlib.h>
 
-//#include <dirent.h>
+#ifndef WIN32
+#include <dirent.h>
+#endif
 
 #include "../../types.h"
 #include "configSys.h"

src/drivers/common/os_utils.cpp

@@ -8,6 +8,7 @@
 #include <io.h>
 #else
 #include <errno.h>
+#include <unistd.h>
 #include <sys/stat.h>
 #endif