*/}}
Browse Source

Windows adaptation

YimingWu 1 year ago
parent
commit
c213757bdd
3 changed files with 5 additions and 2 deletions
  1. 3 0
      CMakeLists.txt
  2. 1 1
      ouroperations.c
  3. 1 1
      ourpaint.c

+ 3 - 0
CMakeLists.txt

@@ -7,6 +7,9 @@ find_package(lagui REQUIRED)
 find_package(PNG REQUIRED)
 find_package(LCMS2 REQUIRED)
 
+add_compile_options("$<$<C_COMPILER_ID:MSVC>:/utf-8>")
+add_compile_options("$<$<CXX_COMPILER_ID:MSVC>:/utf-8>")
+
 add_definitions(-w)
 
 # embed_resource("data.dat" "data.h" "DATA")

+ 1 - 1
ouroperations.c

@@ -1323,6 +1323,7 @@ void our_PaintDoDabsWithSmudgeSegments(OurLayer* l,int tl, int tr, int tu, int t
         our_PaintDoDabs(l,tl,tr,tu,tb,oss->Start,oss->End);
     }
 }
+void ourset_CurrentBrush(void* unused, OurBrush* b);
 void our_EnsureEraser(int EventIsEraser){
     if(EventIsEraser==Our->EventErasing){ return; }
     printf("ev e %d %d\n", Our->EventErasing, Our->Erasing);
@@ -1590,7 +1591,6 @@ int ourinv_MoveBrush(laOperator* a, laEvent* e){
     laNotifyUsers("our.tools.brushes"); laRecordInstanceDifferences(Our,"our_tools"); laPushDifferences("Move brush",0);
     return LA_FINISHED;
 }
-void ourset_CurrentBrush(void* unused, OurBrush* b);
 int ourinv_BrushQuickSwitch(laOperator* a, laEvent* e){
     char* id=strGetArgumentString(a->ExtraInstructionsP,"binding"); if(!id){ return LA_CANCELED; }
     int num; int ret=sscanf(id,"%d",&num); if(ret>9||ret<0){ return LA_CANCELED; }

+ 1 - 1
ourpaint.c

@@ -25,7 +25,7 @@ extern OurPaint *Our;
 int main(int argc, char *argv[]){
     laGetReady();
 
-    if(!ourInit()){ laShutoff(); return -1; }
+    if(!ourInit()){ laShutoff(0); return -1; }
 
     laRefreshUDFRegistries();
     laEnsureUserPreferences();