Linux project updated to SDL2 and Netbeans 7.4

neonichu · Dec 8, 2013 · 30f4339 · 30f4339
1 parent b7a3fc1
commit 30f4339
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 9 deletions.
diff --git a/platforms/linux/Gearboy/nbproject/Makefile-Debug.mk b/platforms/linux/Gearboy/nbproject/Makefile-Debug.mk
@@ -52,7 +52,7 @@ FFLAGS=
 ASFLAGS=
 
 # Link Libraries and Options
-LDLIBSOPTIONS=-lGLU -lSDL -lGLEW -lX11
+LDLIBSOPTIONS=-lGLU -lSDL2 -lGLEW -lX11
 
 nbproject/qt-${CND_CONF}.mk: nbproject/qt-${CND_CONF}.pro FORCE
 	${QMAKE} VPATH=. -o qttmp-${CND_CONF}.mk nbproject/qt-${CND_CONF}.pro

diff --git a/platforms/linux/Gearboy/nbproject/Makefile-Release.mk b/platforms/linux/Gearboy/nbproject/Makefile-Release.mk
@@ -52,7 +52,7 @@ FFLAGS=
 ASFLAGS=
 
 # Link Libraries and Options
-LDLIBSOPTIONS=-lGLU -lSDL -lGLEW -lX11
+LDLIBSOPTIONS=-lGLU -lSDL2 -lGLEW -lX11
 
 nbproject/qt-${CND_CONF}.mk: nbproject/qt-${CND_CONF}.pro FORCE
 	${QMAKE} VPATH=. -o qttmp-${CND_CONF}.mk nbproject/qt-${CND_CONF}.pro

diff --git a/platforms/linux/Gearboy/nbproject/configurations.xml b/platforms/linux/Gearboy/nbproject/configurations.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<configurationDescriptor version="89">
+<configurationDescriptor version="90">
   <logicalFolder name="root" displayName="root" projectFiles="true" kind="ROOT">
     <logicalFolder name="f2" displayName="Audio" projectFiles="true">
       <itemPath>../../../src/audio/Blip_Buffer.cpp</itemPath>
@@ -116,7 +116,6 @@
   <confs>
     <conf name="Debug" type="4">
       <toolsSet>
-        <remote-sources-mode>LOCAL_SOURCES</remote-sources-mode>
         <compilerSet>GNU|GNU</compilerSet>
         <dependencyChecking>true</dependencyChecking>
         <rebuildPropChanged>false</rebuildPropChanged>
@@ -127,7 +126,7 @@
       <compileType>
         <linkerTool>
           <linkerLibItems>
-            <linkerOptionItem>-lGLU -lSDL -lGLEW -lX11</linkerOptionItem>
+            <linkerOptionItem>-lGLU -lSDL2 -lGLEW -lX11</linkerOptionItem>
           </linkerLibItems>
         </linkerTool>
       </compileType>
@@ -321,7 +320,6 @@
     </conf>
     <conf name="Release" type="4">
       <toolsSet>
-        <remote-sources-mode>LOCAL_SOURCES</remote-sources-mode>
         <compilerSet>GNU|GNU</compilerSet>
         <dependencyChecking>true</dependencyChecking>
         <rebuildPropChanged>false</rebuildPropChanged>
@@ -345,7 +343,7 @@
         </asmTool>
         <linkerTool>
           <linkerLibItems>
-            <linkerOptionItem>-lGLU -lSDL -lGLEW -lX11</linkerOptionItem>
+            <linkerOptionItem>-lGLU -lSDL2 -lGLEW -lX11</linkerOptionItem>
           </linkerLibItems>
         </linkerTool>
       </compileType>

diff --git a/platforms/linux/Gearboy/nbproject/project.xml b/platforms/linux/Gearboy/nbproject/project.xml
@@ -20,6 +20,9 @@
                     <type>4</type>
                 </confElem>
             </confList>
+            <formatting>
+                <project-formatting-style>false</project-formatting-style>
+            </formatting>
         </data>
     </configuration>
 </project>
diff --git a/platforms/linux/Gearboy/nbproject/qt-Debug.pro b/platforms/linux/Gearboy/nbproject/qt-Debug.pro
@@ -21,4 +21,4 @@ QMAKE_CC = gcc
 QMAKE_CXX = g++
 DEFINES += 
 INCLUDEPATH += 
-LIBS += -lGLU -lSDL -lGLEW -lX11  
+LIBS += -lGLU -lSDL2 -lGLEW -lX11  
diff --git a/platforms/linux/Gearboy/nbproject/qt-Release.pro b/platforms/linux/Gearboy/nbproject/qt-Release.pro
@@ -21,4 +21,4 @@ QMAKE_CC = gcc
 QMAKE_CXX = g++
 DEFINES += 
 INCLUDEPATH += 
-LIBS += -lGLU -lSDL -lGLEW -lX11  
+LIBS += -lGLU -lSDL2 -lGLEW -lX11