Edited Cmake to test linuxUI

5 files changed, 5 insertions, 114 deletions

diff --git a/ldmicro/CMakeLists.txt b/ldmicro/CMakeLists.txt
index 19c3832..c5dd29e 100644
--- a/ldmicro/CMakeLists.txt
+++ b/ldmicro/CMakeLists.txt
@@ -9,7 +9,7 @@ IF (NOT UNIX)
 ENDIF (NOT UNIX)
 
 MESSAGE ( STATUS "Searching for GTK+3.0..." )
-find_package() (PkgConfig REQUIRED)
+find_package (PkgConfig REQUIRED)
 pkg_check_modules (GTK3 REQUIRED gtk+-3.0)
 
 # Version control
@@ -29,6 +29,9 @@ ENDIF ( GTK3_FOUND)
 
 include_directories("${CMAKE_CURRENT_SOURCE_DIR}/includes")
 
-add_executable (LDMicro ldmicro.cpp miscutil.cpp draw_outputdev.cpp)
+## Dummy compile to test linuxUI
+## to compile LDmicro uncomment the below line
+# add_executable (LDMicro ldmicro.cpp miscutil.cpp draw_outputdev.cpp)
+add_executable (linuxUI linuxUI.cpp)
 
 install (TARGETS LDMicro DESTINATION bin)
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/includes/linuxUI/linuxUI.h b/ldmicro/includes/linuxUI/linuxUI.h
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/ldmicro/includes/linuxUI/linuxUI.h
diff --git a/ldmicro/linuxUI.cpp b/ldmicro/linuxUI.cpp
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/ldmicro/linuxUI.cpp
diff --git a/ldmicro/make.bat b/ldmicro/make.bat
deleted file mode 100644
index 6ad3b48..0000000
--- a/ldmicro/make.bat
+++ /dev/null
@@ -1 +0,0 @@
-@nmake D=LDLANG_EN %*