Small update

novuslogic · Jul 18, 2017 · 23f46de · 23f46de
1 parent dca40d0
commit 23f46de
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ Try
   FDelphiLibSass := TDelphiLibSass.Create('libsass.dll');
   FDelphiLibSass.LoadDLL;
 
-  FScssResult := FDelphiLibSass.ConvertToCss('$font-stack:    Helvetica, sans-serif;');
+  FScssResult := FDelphiLibSass.ConvertToCss('$font-stack: Helvetica, sans-serif; body { font: 100% $font-stack; }');
 
   writeln(FScssResult.CSS);
 Finally

diff --git a/Sample/Main.dfm b/Sample/Main.dfm
@@ -47,10 +47,6 @@ object frmMain: TfrmMain
     object ConvertToCss: TTabSheet
       Caption = 'ConvertToCss Example'
       ImageIndex = 1
-      ExplicitLeft = 8
-      ExplicitTop = 28
-      ExplicitWidth = 671
-      ExplicitHeight = 0
       object btnsasstocss2: TButton
         Left = 3
         Top = 3

diff --git a/Source/Core/DelphiLibSassCommon.pas b/Source/Core/DelphiLibSassCommon.pas
@@ -9,11 +9,11 @@ interface
   cLibSassName = 'libsass.dll';
 
 type
-  TSass_File_Context = IntPtr {Pointer};
-  TSass_Compiler =  IntPtr {Pointer};
-  TSass_Context = IntPtr {Pointer};
-  TSass_included_files = IntPtr {Pointer};
-  TSass_Data_Context = IntPtr {Pointer};
+  TSass_File_Context = IntPtr;
+  TSass_Compiler =  IntPtr;
+  TSass_Context = IntPtr;
+  TSass_included_files = IntPtr;
+  TSass_Data_Context = IntPtr;
 
   PSass_IncludeFiles = ^TSass_IncludeFiles;
   TSass_IncludeFiles = record

diff --git a/Source/Core/DelphiLibSassLib.pas b/Source/Core/DelphiLibSassLib.pas
@@ -66,7 +66,7 @@ procedure TDelphiLibSassLib.LoadDLL;
     fsLibraryFilename := cLibSassName;
 
 
-  fDLLHandle := LoadLibrary(PWideChar(fsLibraryFilename));
+  fDLLHandle := SafeLoadLibrary(fsLibraryFilename);
   if fDLLHandle =0 then
     raise EDelphiLibSassError.Create('Unable to Load DLL');
 

diff --git a/Source/Packages/DELPHIXE8/LIBSASS_CORE.DPK b/Source/Packages/DELPHIXE8/LIBSASS_CORE.DPK
diff --git a/Source/Packages/DELPHIXE8/LIBSASS_CORE.DPROJ b/Source/Packages/DELPHIXE8/LIBSASS_CORE.DPROJ
@@ -496,13 +496,13 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
-                <ProjectRoot Platform="OSX32" Name="$(PROJECTNAME)"/>
+                <ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/>
                 <ProjectRoot Platform="Android" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/>
+                <ProjectRoot Platform="OSX32" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="iOSSimulator" Name="$(PROJECTNAME).app"/>
-                <ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/>
             </Deployment>
         </BorlandProject>
         <ProjectFileVersion>12</ProjectFileVersion>

diff --git a/Source/Packages/DELPHIXE8/LIBSASS_CORE.res b/Source/Packages/DELPHIXE8/LIBSASS_CORE.res