Dropped support for windows cross compilation

6 files changed, 18 insertions, 131 deletions

diff --git a/ldmicro/CMakeLists.txt b/ldmicro/CMakeLists.txt
index 8cb7563..2e20552 100644
--- a/ldmicro/CMakeLists.txt
+++ b/ldmicro/CMakeLists.txt
@@ -3,14 +3,8 @@ cmake_minimum_required(VERSION 2.6)
 project(LDMicro)
 
 IF(WIN32)
-    MESSAGE( STATUS "Building for Windows.." )
+    MESSAGE( FATAL_ERROR "Cannot build for windows, exiting" )
     add_definitions(-D__WIN32__)
-    include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../common/win32")
-    MESSAGE( STATUS "Setting path" )
-    add_definitions(__WINDOWS_SYSTEM__)
-    set(PKG_CONFIG_PATH "C:/path/to/gtk/lib/pkgconfig")
-    set(PATH "C:/path/to/gtk/bin;%PATH%")
-    MESSAGE( STATUS "Setting path - done" )
 ENDIF(WIN32)
 
 IF(UNIX)
@@ -30,6 +24,7 @@ IF(UNIX)
 ENDIF(UNIX)
 
 IF (MSVC)
+    MESSAGE( FATAL_ERROR "Cannot build for MacOS, exiting" )
     add_definitions(-D__MSVC__)
 ENDIF (MSVC)
 
diff --git a/ldmicro/Makefile b/ldmicro/Makefile
deleted file mode 100644
index 3bc6257..0000000
--- a/ldmicro/Makefile
+++ /dev/null
@@ -1,111 +0,0 @@
-DEFINES = /D_WIN32_WINNT=0x400 /DISOLATION_AWARE_ENABLED /D_WIN32_IE=0x400 /DWIN32_LEAN_AND_MEAN /DWIN32 /D$(D)
-CFLAGS  = /W3 /nologo -I..\common\win32 /O2 /D_CRT_SECURE_NO_WARNINGS /D_DEBUG /Zi
-
-HEADERS = ..\common\win32\freeze.h ldmicro.h mcutable.h intcode.h
-
-OBJDIR = obj
-
-COMPDIR = components
-
-FREEZE   = $(OBJDIR)\freeze.obj
-
-LDOBJS   = $(OBJDIR)\ldmicro.obj \
-           $(OBJDIR)\maincontrols.obj \
-           $(OBJDIR)\helpdialog.obj \
-           $(OBJDIR)\schematic.obj \
-           $(OBJDIR)\draw.obj \
-           $(OBJDIR)\draw_outputdev.obj \
-           $(OBJDIR)\circuit.obj \
-           $(OBJDIR)\undoredo.obj \
-           $(OBJDIR)\loadsave.obj \
-           $(OBJDIR)\simulate.obj \
-           $(OBJDIR)\commentdialog.obj \
-           $(OBJDIR)\contactsdialog.obj \
-           $(OBJDIR)\coildialog.obj \
-           $(OBJDIR)\simpledialog.obj \
-           $(OBJDIR)\resetdialog.obj \
-           $(OBJDIR)\lutdialog.obj \
-           $(OBJDIR)\confdialog.obj \
-           $(OBJDIR)\iolist.obj \
-           $(OBJDIR)\miscutil.obj \
-           $(OBJDIR)\lang.obj \
-           $(OBJDIR)\intcode.obj \
-           $(OBJDIR)\compilecommon.obj \
-           $(OBJDIR)\ansic.obj \
-           $(OBJDIR)\interpreted.obj \
-           $(OBJDIR)\pic16.obj \
-           $(OBJDIR)\avr.obj \
-           $(OBJDIR)\arduino.obj \
-           $(OBJDIR)\advanceddialog.obj \
-           $(OBJDIR)\componentlist.obj \
-           $(OBJDIR)\componentimages.obj \
-           $(OBJDIR)\naminglist.obj
-
-
-COMPOBJS  = $(OBJDIR)\components.obj \
-			$(OBJDIR)\switch.obj \
-			$(OBJDIR)\relay.obj \
-			$(OBJDIR)\spdt.obj \
-			$(OBJDIR)\dpst.obj \
-			$(OBJDIR)\dpdt.obj
-
-HELPOBJ  = $(OBJDIR)\helptext.obj
-
-CLEANOBJ  = $(OBJDIR)\helptext.cpp \
-            $(OBJDIR)\helptext.obj \
-            $(OBJDIR)\lang-tables.h \
-            $(OBJDIR)\ldmicro.exe \
-            $(OBJDIR)\ldmicro.obj \
-            $(OBJDIR)\ldmicro.res \
-            $(OBJDIR)\freeze.obj \
-            $(OBJDIR)\ldinterpret.exe \
-            $(OBJDIR)\ldmicro.ilk \
-            $(OBJDIR)\ldmicro.pdb \
-            ldinterpret.exe \
-            ldinterpret.obj \
-            ldmicro.exe \
-            vc100.pdb \
-            reg\results
-
-LIBS = user32.lib gdi32.lib comctl32.lib advapi32.lib windowscodecs.lib ole32.lib
-
-all: $(OBJDIR)/ldmicro.exe $(OBJDIR)/ldinterpret.exe
-    @cp $(OBJDIR)/ldmicro.exe .
-    @cp $(OBJDIR)/ldinterpret.exe .
-    @cd reg
-    @go.bat
-    @cd ..
-
-clean:
-	rm -rf $(LDOBJS) $(COMPOBJS) $(CLEANOBJ) 
-    rmdir reg\results
-
-lang.cpp: $(OBJDIR)/lang-tables.h
-
-$(OBJDIR)/lang-tables.h: lang*.txt
-    perl lang-tables.pl > $(OBJDIR)/lang-tables.h
-
-$(OBJDIR)/ldinterpret.exe: ldinterpret.c
-    @$(CC) -Fe$(OBJDIR)/ldinterpret.exe $(LIBS) ldinterpret.c
-
-$(OBJDIR)/ldmicro.exe: $(LDOBJS) $(COMPOBJS) $(FREEZE) $(HELPOBJ) $(OBJDIR)/ldmicro.res
-    @$(CC) $(DEFINES) $(CFLAGS) -Fe$(OBJDIR)/ldmicro.exe $(LDOBJS) $(COMPOBJS) $(FREEZE) $(HELPOBJ) $(OBJDIR)/ldmicro.res $(LIBS)
-
-$(OBJDIR)/ldmicro.res: ldmicro.rc ldmicro.ico
-	@rc ldmicro.rc
-	@mv ldmicro.res $(OBJDIR)
-
-$(LDOBJS): $(@B).cpp $(HEADERS)
-    @$(CC) $(CFLAGS) $(DEFINES) -c -Fo$(OBJDIR)/$(@B).obj $(@B).cpp
-
-$(COMPOBJS): $(COMPDIR)/$(@B).cpp $(HEADERS)
-    @$(CC) $(CFLAGS) $(DEFINES) -c -Fo$(OBJDIR)/$(@B).obj $(COMPDIR)/$(@B).cpp
-
-$(FREEZE): ..\common\win32\$(@B).cpp $(HEADERS)
-    @$(CC) $(CFLAGS) $(DEFINES) -c -Fo$(OBJDIR)/$(@B).obj ..\common\win32\$(@B).cpp
-
-$(HELPOBJ): $(OBJDIR)/helptext.cpp
-    @$(CC) $(CFLAGS) $(DEFINES) -c -Fo$(OBJDIR)/helptext.obj $(OBJDIR)/helptext.cpp
-
-$(OBJDIR)/helptext.cpp: manual.txt manual-*.txt
-    perl txt2c.pl > $(OBJDIR)/helptext.cpp
diff --git a/ldmicro/draw_outputdev.cpp b/ldmicro/draw_outputdev.cpp
index 2173bb5..7df670c 100644
--- a/ldmicro/draw_outputdev.cpp
+++ b/ldmicro/draw_outputdev.cpp
@@ -21,6 +21,8 @@
 // stuff to write to a file, or all the routines concerned with drawing to
 // the screen.
 // Jonathan Westhues, Dec 2004
+// 
+// Ported to linus by: R Ramana, 2018
 //-----------------------------------------------------------------------------
 #include <windows.h>
 #include <stdio.h>
@@ -80,7 +82,7 @@ SyntaxHighlightingColours HighlightColours;
 //-----------------------------------------------------------------------------
 void CALLBACK BlinkCursor(HWND hwnd, UINT msg, UINT_PTR id, DWORD time)
 {
-    if(GetFocus() != MainWindow && !CursorDrawn) return;
+    if(!isFocus(MainWindow) && !CursorDrawn) return;
     if(Cursor.left == 0) return;
 
     PlcCursor c;
diff --git a/ldmicro/includes/linuxUI/linuxUI.h b/ldmicro/includes/linuxUI/linuxUI.h
index e084e73..02691b5 100644
--- a/ldmicro/includes/linuxUI/linuxUI.h
+++ b/ldmicro/includes/linuxUI/linuxUI.h
@@ -20,8 +20,10 @@ typedef bool BOOL;
 typedef GdkRGBA COLORREF;
 typedef unsigned char BYTE;
 typedef unsigned int DWORD;
+
+/// all handles will hold a GtkWindow* type
 typedef void* PVOID;
-typedef PVOID HANDLE;
+typedef GtkWindow* HANDLE;
 typedef HANDLE HINSTANCE;
 typedef HANDLE HWND;
 typedef HANDLE HDC;
@@ -47,4 +49,10 @@ typedef uint64_t UINT_PTR;
 typedef unsigned int UINT_PTR;
 #endif
  
-typedef UINT_PTR WPARAM;
\ No newline at end of file
+typedef UINT_PTR WPARAM;
+typedef unsigned int UINT;
+
+/// common windows referances for linux - end
+
+/// functions
+BOOL isFocus(HWND);
\ No newline at end of file
diff --git a/ldmicro/ldmicro.cpp b/ldmicro/ldmicro.cpp
index e1a55a6..e7e3f17 100644
--- a/ldmicro/ldmicro.cpp
+++ b/ldmicro/ldmicro.cpp
@@ -24,13 +24,7 @@
 // most of the UI logic relating to the main window.
 // Jonathan Westhues, Oct 2004
 //-----------------------------------------------------------------------------
-#ifdef __UNIX__
 #include "linuxUI/linuxUI.h"
-#elif defined(__WIN32__)
-#include <windows.h>
-#include <commctrl.h>
-#include <commdlg.h>
-#endif
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/ldmicro/linuxUI.cpp b/ldmicro/linuxUI.cpp
index b7fa4aa..2722101 100644
--- a/ldmicro/linuxUI.cpp
+++ b/ldmicro/linuxUI.cpp
@@ -1,8 +1,7 @@
 #include "linuxUI/linuxUI.h"
 
-int main (int argc, char**argv)
+/// Wraper function for gtk_window_has_toplevel_focus
+BOOL isFocus(HWND window)
 {
-    int status = 0;
-    
-    return status;
+    return (BOOL) gtk_window_has_toplevel_focus(GTK_WINDOW(window));
 }
\ No newline at end of file