Home Explore Help
Sign In
ivalentin
/
V-Gears
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge pull request #37 from CapsAdmin/master

luajit cmake fixes
paulsapps 11 years ago
parent
685c5fe358 d152f107c0
commit
b5fac27a45
3 changed files with 3 additions and 3 deletions
Split View Show Diff Stats
  1. 1 1
      .gitmodules
  2. 1 1
      output/plugins_d.cfg
  3. 1 1
      wix.template.in

+ 1 - 1
.gitmodules
View File 

@@ -11,4 +11,4 @@
 
 	branch = master
 
 [submodule "dependencies/luajit"]
 
 	path = dependencies/luajit
 
-	url = https://github.com/LuaDist/luajit.git
 
+	url = https://github.com/q-gears/luajit.git

+ 1 - 1
output/plugins_d.cfg
View File 

@@ -6,7 +6,7 @@ PluginFolder=.
 
 # Define plugins
 
 # Plugin=RenderSystem_Direct3D9_d
 
 # Plugin=RenderSystem_Direct3D11
 
- Plugin=RenderSystem_GL
 
+ Plugin=RenderSystem_GL_d
 
 # Plugin=RenderSystem_GLES
 
 # Plugin=RenderSystem_GLES2
 
 # Plugin=Plugin_ParticleFX

+ 1 - 1
wix.template.in
View File 

@@ -16,7 +16,7 @@
 
         <Package InstallerVersion="301" Compressed="yes"/>
 
 
 		<DirectoryRef Id="TARGETDIR">
 
-            <Merge Id="VC10CRT" Language="0" DiskId="1" SourceFile="$(env.ProgramFiles(x86))\Common Files\Merge Modules\Microsoft_VC110_CRT_x86.msm" />
 
+            <Merge Id="VC10CRT" Language="0" DiskId="1" SourceFile="$(env.ProgramFiles(x86))\Common Files\Merge Modules\Microsoft_VC120_CRT_x86.msm" />
 
         </DirectoryRef>	
         <Feature Id="runtimes" Title="3rd party runtime libraries" Level="1" Description='3rd party libraries necessary for operation' Display='expand'>
 
             <MergeRef Id='VC10CRT' />