widget-set support. Now the detected widget-set (gtk, gtk2, qt) is used in linux. Without specifying the type, usdx produced debugger messages while trying to open a message-box (to show information about an exception).

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@934 b956fd51-792f-4845-bead-9b4dfca2ff2c

2 files changed, 2 insertions, 7 deletions

diff --git a/Game/Code/Makefile.in b/Game/Code/Makefile.in
index 3e302bd5..4f9a5ba8 100644
--- a/Game/Code/Makefile.in
+++ b/Game/Code/Makefile.in
@@ -67,7 +67,7 @@ PUNIT_FLAGS = \
     $(PUNIT_TOKEN)$(LAZARUS_DIR)/components/images/lib/$(PPROCESSOR)-$(PPLATFORM) \

     $(PUNIT_TOKEN)$(LAZARUS_DIR)/components/jpeg \

     $(PUNIT_TOKEN).

-#    $(PUNIT_TOKEN)$(LAZARUS_DIR)/lcl/units/$(PPROCESSOR)-$(PPLATFORM)/$(LCL_WIDGET_TYPE)

+    $(PUNIT_TOKEN)$(LAZARUS_DIR)/lcl/units/$(PPROCESSOR)-$(PPLATFORM)/$(LCL_WIDGET_TYPE)

 

 # Directory where compiled units (.ppu and .o files) are stored

 PCUNIT_TOKEN = -FU

@@ -79,10 +79,7 @@ PINC_TOKEN = -Fi
 PINC_FLAGS = $(PINC_TOKEN)lib/JEDI-SDL/SDL/Pas

 

 # Defines

-PDEFINES  = -dLCL 

-# this is necessary to use lazjpeg instead of Ulazjpeg

-# but requires configure to detect if gtk/gkt2 or qt is used

-#-dLCL$(LCL_WIDGET_TYPE)

+PDEFINES  = -dLCL -dLCL$(LCL_WIDGET_TYPE)

 

 # FPC flags

 

diff --git a/Game/Code/UltraStar.lpr b/Game/Code/UltraStar.lpr
index cbb44adf..c4c1e4ae 100644
--- a/Game/Code/UltraStar.lpr
+++ b/Game/Code/UltraStar.lpr
@@ -8,11 +8,9 @@ uses
   {$ifdef unix}            // http://wiki.lazarus.freepascal.org/Multithreaded_Application_Tutorial
     cthreads,              // THIS MUST be the first used unit !!
   {$endif}
-  {$ifdef MSWINDOWS}
   {$ifdef LCL}
   Interfaces,              // Initialize Lazarus LCL (necessary for usage of LCLIntf, etc.)
   {$endif}
-  {$endif}
 
   {$I UltraStar.dpr}